Blocking the heat crossover is basically a must anyway , you need to be near or below freezing , otherwise it just overheats the intake
Fel Pro 1215 is the part # for the intake gasket
For the choppy idle I would suggest using a Coolcarb spacer to drop the carb temp significantly .
water temp is good do you have an infrared temp gauge to check oil temp ? an oil cooler could help .