3.4 996 Engine upgrade

[whitecliffs]

Hi currently in the process of installing a 3.4 996 engine into my 2.5 its a rebuilt motor, new bearings, piston rings, chains, guides etc.
Ive a few questions hopefully someone can answer

1, As the engine will need breaking in, will it run with the 2.5 map to do this before my remapping guy reflashes the ecu with the 3.4 map and runs it on the rollers.

2, I'm going to use the 5 speed gearbox with an aasco lightweight flywheel to start, with the options of switching to a 6 speed at a later date, So what up-rated clutches are available for the 5 speed one with a spring loaded disc, part numbers would be great.

Thanks