well if you're going to get a turbo either way which it kinda sounds like, not to sure though, you might as well get the swap taken care of b4 you start working on what u got now.
it all depends on wha tyou want from your motor and car. do you want straight line high hp output? (drag racing) Do you want usable hp for around town. Do you want good throttle response and good for road racing/ auto x? how much power do you want? how much money you got?