Be careful to stick to your plan or you end up with this.
I had the same desire spurred by the need for a top end rebuild. I went EFI with megasquirt also controlling EDIS based twin-plug electronic ignition based on a Carrera 3.2 intake and fuel rails. I opted to upgrade the P/C's to a 3.2ss at that time, although this adds significantly to the expense. Using SSI's and an OEM muffler I was able to hit almost 230 RWHP. This was with 964 cams which do delay peak torque above 4500 RPM. ITB's would be a great option and I debated this but ultimately I had the notion to try to turbocharge my car so this swayed me to the 3.2 intake. Things have continued to slide down the slippery slope since then.