On your Baja shelf, since that is the main entrance to the pool, make sure you look at the step height down from the coping to the shelf - you may want to add an entry step? Also, the steps leading from your Baja shelf to the main pool - make sure those steps have a reasonable rise/step (7” - 8”). Also, check to see if you have room for two umbrella holders on your Baja shelf - you may want to change that to one holder centered on the shelf (we originally had two in our pool plans and the PB pointed out (correctly) that there was not room for two reasonable size umbrellas on our shelf which is 11’ wide by 8’ long.
Good luck.