Sounds like new hw tank time.
The expansion tank can be anywhere in the system (after the pressure reduction valve)...pick one that make it easy to install and service.
Can't help on the other items. If a major leak is a potential problem, consider a pan. Also, consider a device from Tacohvac.com called the WAG. I've never used one, but it looks interesting. I'm not a pro...good luck.