V6 vs V7 Bridge STP issue

I have as setup that has worked well for a couple of years. What I have is I have a router at a grain elevator that then feeds another tower wirelessly. At the other tower I have Netonix switch. That tower is fed by two radios. An Airfiber 60-LR and an Airfiber 5XHD. The 60-LR is the primary while the 5XHD only takes over when rain takes down the 60ghz link.

To accomplish this I setup the Netonix with RSTP in the below configuration.
Netonix.PNG
On the router side at the feed tower I have the following setup.
V6 Bridge STP.PNG
V6 Bridge.PNG
V6 Bridge Status.PNG

V6 Ports STP.PNG
V6 Ports Status.PNG
V6 Ports Gen.PNG

Question 1: Is there anything wrong with the above setup. Should I be doing something differently to get the same results?

Issue 1: If the ethernet link on one of the radios on the switch side drops the link failsover properly. However if I unplug one of the ethernet ports in the Bridge on the router side all traffic forwarded through the router stops until the ethernet cable is reconnected. If I instead reboot one of the wireless radios on the router side the router continues to forward traffic properly like nothing happened.

Issue 2:

I went out today and replaced the tower router (RB450Gx4) running 6.47.7 with a RB4011 running 7.12.1. When I did that bridge ports were both active with one mostly sending traffic and the other mostly receiving.

When I logged into the Netonix switch at the other tower instead of the ports being like the photo in post 1 they were both in a Forwarding State and both had the Root Role. Again if I unplugged one of the ethernet cables on the router side all traffic on the router stopped forwarding.

Also on the RB4011 it showed both ports (BHM60 and BHM) as Edge Ports=Yes where on V6 it showed both of them Edge Ports=No.

I ended up having to put the RB450Gx4 back so I could figure out the cause.

Question 2:

Did I do something wrong with my configuration, or should I be doing this setup another way? See photos below for how I have the RB4011 setup. These are photos with the RB4011 on the bench connected to nothing.
V7 Bridge Status.PNG
V7 Bridge STP.PNG
V7 Bridge.PNG
V7 Ports STP.PNG
V7 Ports Gen.PNG
V7 Ports Status.PNG

I guess to summarize I want to have two PtP wireless links work in an active/failover setup where one tower only has a switch (Netonix) and the other side has a router. Right now it works with the router side running V6, but that could be do to dumb luck and not because I have it configured properly because when the router is instead V7 it does not work as intended.