I may be wrong, but air in the coolant lines will make the idle surge. Since you swaped the intake mani, and that has coolant lines to/from, air probably got into the system.