Yacht Club accessible rooms water

Hi!!! Need an accessible room for the first time, but really want to be overlooking gazebo. Our first YC trip we were in 4129. It had a tub with grab bar. An old map shows 2129 and 3129 are the same. Can anyone confirm? We love sipping on coffee, watching the boats, and watching the bunnies at the gazebo. Thanks in advance!