I think I'm going to go with the motor replacement for now. Hopefully it's better than the original.