I'd consider a b18b. More power, and you can boost it when you have more money..

But yeah, don't mod your CX engine, you will regret it later.