Hi all. Looking for some advice as someone with rather basic plumbing skills. Pictured is my current setup inherited from previous owners:

When I open in the spring, I'm looking to do a few things:
Any other advice/gotchas to be aware of as I plan this out would be much appreciated.

When I open in the spring, I'm looking to do a few things:
- Replace the corrugated hoses with more standard PVC or Flex PVC
- Install a new heater (Raypak Natural Gas) and re-introduce the heater into the plumbing
- Install a Jandy check valve after the heater
- Install an external heater bypass with a Jandy 3-way
- Install unions at all points where disconnection is needed for winterization
- Install an inline or offline chlorinator (currently using a floater but want to protect the heater from concentrated chlorine as much as possible)
Any other advice/gotchas to be aware of as I plan this out would be much appreciated.