I had the same problem this summer. I ended up using a standard 235 Water pump and had the flange pressed down to clearance the fan from the radiator. Its a tight fit, but it's all snuggled in there and nothing leaks, and the radiator cools great now.
I wish I would have know about this site when I was dealing with this issue as I would have just bought a short shaft water pump and new gaskets and been done with it. But as luck goes I ended up doing things the hard way. How much fun would it have been to have the right parts the first time anyways!?!