Pipe Hard With a Vengeance! Way to go Karl!!
Only advice at this point: as you plan where each component is going to reconnect, try to picture how you would go about replacing it in the future, if you had to. Not just the main components, but down to every valve, PVC elbow, check valve, etc. If something broke, or cracked or leaked, and you had to cut it out, will you have enough PVC pipe between it and the component on either side to glue in a new one with PVC couplers between it and its neighbors.
You might not be able to leave enough PVC pipe between everything to make that possible, so be it. But where you can, leave the extra space. Otherwise, when things are too close together, you might have to start replacing more than one thing, including parts that are still working, just to be able to replace the one defective part. Or figure out how to "unglue" PVC joints. Which is not impossible, but not much fun.