You haven't even mentioned stroking what you've allready got. Why not do a 2.0 stroker? It'll be a damn sure sleeper. Still look like a 1.6 but be a lot stronger.