Pump Primer & Battery

She has been struggling to prime the pump recently and water had been pouring out of the primer exhaust when it wasn't mean to. On the side of the pump there are two twist off caps and inside is a rubber diaphragm. The left hand side was completely split in half and the right hand side had shifted and started to split. The little clips that hold the rubber in place are hugely awkward, you need a UJ wrist to wrestle them out. One clip was very stuck and I pretty much had to destroy it to get it out. I think I can either reshape it or use a suitable circlip. Its thick 4mm rubber and got some of this is on order. Luckily one of the diaphragms is in a condition where I can make a pattern from it. Also the battery was on its way out last year, and didn't disappoint, first start after a full recharge and just couldn't cope. New battery was fitted and, even after 6 months of standing, she started on the first rotation.