Look at: http://www.stoveboltengineco.com/

They have replacement water pumps that are shorter (and I think made for that application) and talk about various mods on their tech page to do that kind of motor swap.