My undergraduate course used Schutz and Carroll. I think, as long as you are comfortable with both proof based and dirty mathematics, you can start with physics grad texts. In fact, a lot of times, the concepts are easier to understand with more conceptually elegant mathematics.