Just an update. The new PB is moving very fast! The pool shell has already been levelled and walls straightened. They are now almost done with the plumbing. They are using rigid schedule 40 pvc, 1.5". I'm making them do a pressure test before burying the lines. He said they will do a leak test with water, not air.
Here is how we ended up placing the returns, skimmer, and lights (note: the drains were already in place from the previous PB). The drains are on a seperate run than the skimmer.