Hot Tub Disconnect and Equipotential Bonding?

[raykit65]

Here is my scenario....

I have a new free standing hot tub that was installed during a deck renovation that replaced an existing hot tub.
The hot tub is installed on slab but with an elevated deck built around it so just the hot tub edge sits above the deck.
The hot tub is under a roof and inside room with solid wood walls about 30" tall and screen above.
I am replacing some conduit and wire (previous 'electrician' sleeved 6/3 under the deck along with other violations)

Here are my concerns as I don't do a lot of hot tubs....

The existing disconnect is less than 5' but on the other side of the 30" wall. It is technically out of sight when you are inside the tub but clearly visible as you are walking in and out. Is this location fine or do I need to relocate it onto the house where it is 5'+ away and visible through the screen door while in the tub?

The tub sits above the 28" rule for equipotential bonding however the deck changes that. Do I need to install the bonding wires around the tub?

**See attached pic and rough sketch**

 

[AC\DC]

If the tubs listed as self contained I believe it’s called you don’t need an equal potential bond— there a section that allows a barrier for closer disconnects .
As long as you can see the disconnect some were along the hot tub you fine. Cut a peice of plexy glass on back side of the disconnect as long as you can see it never said what part you have to see