You are a bit into modifying engines, Why not getting a Basic N12T1 and give it a Mega MF (mod) timing which can be found at www.first-racing.eu? (The Mega MF is based on the same engine bore x stroke)

It is the cheapest solution to get a competive engine.