What you need is the short-shaft water pump. The 216/early 235 used a different setup. Some of the on-line vendors sell them. Patrick's sells one with a larger pulley so the pump runs slower and doesn't cavitate at higher rpm.
www.patricksantiquecars.com On the fan, use the 5 blade if you can. They pull more air than the 4 blade. When I was young you could buy the 5 blade at any auto parts store. The on-line vendors now sell a repop of the original 4 blade.
