If you decide to upgrade your present guitar.....then take Razbo's advice (I plan to) and go test drive the guitars you want many times before you lay down 500+ bucks.
I'm still working on GF 2 and trucking along on my Squier. But I know one day my skills will grow out of that guitar, so I'm already shopping for that 'one' guitar to lay down 1000 bucks on. That'll be a long buying process trying to make sure I get just the right one. But that's what I did to get my starter guitar. It took three months of reading, study, comparing, etc etc.Take your time, you'll find it.
GG