Fit a 1600, by the time you mess on putting new pistons, twin 40's, cams etc, you'll only have brought the power about level with that of a standard 1600, then do the whole piston swap, cam, twin 40's, makes far more sense, thats what im rolling with, but ive got bik carbs instead.