Ok. So if I understand correctly there's no immediate issue. You would just like an UPS-friendly as possible layout by utilizing the longer underground pipes and the various buried junctions/angles/etc.
I'll see what I can do. I might not be able to incorporate it all, and the things that I can do might not be added all at once. But I guess every step help. Might take a while though. P.U.M.P. was not built with this kind of options in mind. But it would make P.U.M.P. more complete if this would work.
Disclaimer though. P.U.M.P. does not, and will not, make better layouts then you (the experienced player) can make by yourself. It's a convenience tool following some patterns that are pre-programmed that might not always produce the most efficient solution. So if it's the UPS-friendly layouts you're hunting for, P.U.M.P. will not be able to deliver on a consistent basis; even after adding the options A.F.H. has to offer. It does do a pretty good job, if I say so myself, and implementing the A.F.H. will surely help. But it'll never be perfect.