Dont bother changing the doors, or the mechanism, just oil it and work it a bit, its sticking open, hence the bounce.
As for the leak, you can change the seal, it mgith help, but youd do better adjusting the door hinges etc first and making sure its a good fit.
All my defenders leaked, just get used to it!