Notes on the Tank's water pumping.
It's seal was also bad and most of the water would pump up / out of the shaft. I tried various sizes of O-rings but the seal ended up being a bit of my Silicone ZerksPlus High Temp Silicone Tubing 3/16" ID x 1/4" OD - pretty much the length of what I used in my sight glass for my No.32. I did leave a 3mmx1 on first, rather I left it on from my previous tries. Then I put a bit of teflon tape on the threads. I think it is also important not to get the set nut on to tight.
I did take the pump off the tank but the check valve spring & ball (brass I think) was in great shape. I cleaned inside the valve area a little bit but it wasn't nasty at all. I didn't undo the shaft / pump lines, not sure if there is anything inside but I saw no reason to disassemble any further.
I only get a few drips from the shaft now and I keep the shaft lubed with my silicone grease pen. When I was testing pumping water into the tank, after about two shot glasses it stop moving water. I thought well, that didn't last long! Then until I realized I had built up pressure in the tank (because the throttle was closed tight). I bumped the whistle lever and it very faint whistle came out. After that I was able to pump water into the tank again :-)