Since you have a rebuilt gear box, have you taken a look at a rebuilt 3.0 and keeping the CIS? The 7:31 will hold a 180HP US 3.0 well with normal driving & occasional red light GPs. Mine was "N-I-Z-E" nice with the 915 7:31. If you go for an 84-86 3.2 try to get the matching trans & ECU box too. IMHO Just keep your numbers motor & trans for vehicle resale value. A steering wheel & tail can be replaced to keep as much OEM as possible. Make your self happy and keep the restoration parts for the years down the road when the OEM resale value comes around.