Loving what you go going on there. Your situation sounds similar to mine. I'm thinking about not doing deep end/diving, but have a jumping stone and ~6.5' depth just around the stone. Our terrain (a slope on solid rock), wanting as much walkable/usable pool area, plus hoping to save a bit of money is driving this decision. I need to be able to build a small pool pavilion to gain some much needed outdoor living space. As far as the sun shelf, if you want lounge chairs on the shelf, it might be tight, especially since that is your entry as well. Are you considering putting in an umbrella sleeve? It might be fine for just a shallow area for kids to hang, or a chair or two (those small plastic Adirondack types). I want a sun shelf too, but I am thinking about having it raised with a spillover, so separate from the entry area. Are you set on getting the integrated spa?