My 2 cents if its worth that much improve on the engine shop around for parts do some research and find out how to get more power from your motor. Mabye new head? such as porting, intake, exhaust and cams mabye bottom end rebuild with higher compression pistions? or try to improve handling. BUT my advice dont listen to others and saying to wait another 2 years things may change you may change your mind i don't know but 2 years is along time.i know how you feeling seeing as i had a faster car then the one i have now and your always lusting after power. but who knows you might have more money when comes to buy a turbo engine or car to replace your other motor either way your never going to make your money back so its weither or not your devoted enough to do it or willing. that said you can also get a different na car but in the end if its not big on liters or power then its not really gonna be fast or cheap so completely up to you just my 2 cents don't hate me for it.
Also shop around in more then one place and if your mechanical minded then do the stuff your self save your self heaps if you know how to do it.