i have a project on it's way right now similar to yours. going from a 350 to 400. i built the lower end a little stronger using the stock crank but new pistons and rods. machining of the block,pistons,rods and bearings and you will be at 2200 in no time.