I would get a decent amp before a better guitar myself, but the only person here who can say what you'll enjoy more is yourself.
One advantage of getting a good guitar first is that you'll be better equipped to play a gig somewhere that already has a sound system (for example, at a chuch).
"If one has realized a truth, that truth is valueless so long as there is lacking the indomitable will to turn this realization into action!"
-A.H.
-A.H.