For SR, then, Spacetime Physics by Taylor and Wheeler is a good one, I gather?
And for GR, I should learn tensor calculus (something I've been putting off for lack of time), and these books will cover the rest, do you think?
From what you've said, good books are Schutz, Taylor and Wheeler...