Yes, you would need the older 0800.040. I am out of this pump, we hope to have more next week. The shaft should only get some minor superficial rust, that shouldn't affect the operation. The more common issue is that some sand or grit inside the hole in the drive unit is causing it to get hung up on the shaft and cleaning the hole with vinegar and a pipe cleaner may solve the problem.