I like the color, very good/clean car to start with.
I'd say enjoy the m20 for a little while before you decide to swap/turbo.
Look here for some small mods to get more power out of the m20.
Once you know you need the extra power, my vote goes to the s50 or s52 (e36 m3 motors). It will be more reliable than going FI, but if you aren't concerned about reliability then you can consider FI.
Welcome to max.