Need a little help with plumbing layout at my equipment pad

[TroubleFreePat]

Need a little advice doing the plumbing work to add my heat pump. I attached some photos and drew out a 2":1" layout on graphing paper.

First image below is simple the current layout on my pad.

Second image is the current layout on graphing paper.

Last image is my proposed layout.

It was recommended I turn my heat pump so the inlet/outlet are facing my existing equipment. Would help cut down on 90s and PVC in general. Great idea, but. . . There's no way I can get everything to fit (The bypass, valves and SWG.) Just too tight.

So am I missing anything simple? Any recommendations?

 

[TroubleFreePat]

Had an idea after the original post and made a quick mod. Version 2 below. Keep the SWG roughly where it is, but slide it closer to existing jandy.

This allows me to use two new jandys (As couplings that I'll need anyway) and gives me a little more room/play for the bypass loop, but keeps everything a bit neater (At least in my head.)

Thoughts?

 

[JasonLion]

Your final diagram looks fine.