What's the point of putting money into this engine at all if you plan to swap in the future? That seems like a bad investment to me... more like impatience.

If you plan to swap, save all the money that you want to put into the motor you have now and just do the swap when you have money. Otherwise, do FREE things to your engine that you can do yourself. If you have a dremel tool you could do port matching alone and some other things.. think for the future.