Hi, Jake,

Reading "between the lines" of your post, I think you may be answering your own question. It sounds like you'd like to redo the whole thing.....I would agree.

You've got some pretty tight spots there and the "patch" to get up and running will be awkard looking and complex to deal with.

All pvc work seems to me to be a series of compromises...trying to get the fewest turns, largest pipe, etc.

The chlorinator and heater is your choice. I would take them out trying to leave enough room (or a bypass) for future additions with straight line pipe.

It looks like you've got 3 - 1.5 inch suction lines from the pool. If you could manifold those together and then go into the pump with a 2" line, that would be a very adequate suction side.

All the 2" plumbing that you use is somewhat (but not hugely) helpful in reducing your total head. That said, I have found 2" MUCH more difficult to install in limited spacing.....1.5" is much less space consuming. As I said earlier........compromises, compromises.