The engine will be getting upgraded but not straight away. Most of my driving is from home at 1000m elevation to town 350m elevation. I'm either rolling down, or climbing in third gear at 35mph for 15 minutes with reduction boxes with the odd second gear section for the switchbacks. I have the 911 shifter, brakes hubs, driveshafts, trailing arms etc. and will be using as much as i can. I know I probably need to put some universal joints and a guide bush into the shift linkage. I do have the Porsche engine too (which I need to sell), but I'm going to stick with a 1600 and build a mild 2.1 with a small turbo and megasquirt.