Cams...too many dang choices!

use the same cam and check you piston to valve clearance, then if this is good advance the cam 6-8 degrees and loosen the valve lash up .006" to .008". this will lower the torque band of the cam to suit the rest of your combo.