Is your home on the side of the baja deck with the steps or on the opposite side?
The general recommendations is to not have the pool light facing towards your home and/or patio where you are sitting - looking at the pool?
Looking at your layout, the assumption is that the baja shelf/steps are nearest your home therefore that light across from it could be shining towards the home. You need to clarify where the house is situated on your layout.
With regard to the light on the short sided wall, it may or may not be an issue. I have a light that is on the left side as I lookout from my home and patio and I do not thing it is an issue but everyone has different views of what is acceptable.