Router Recommendation?

I’m working on a pretty modest network setup:

• 1 Fiber Circuit (100/100)
• 1 Cable Circuit (70/30)
• IPSEC Tunnel to AWS with BGP (ideally redundant across both WANs)
• VOIP with QOS – about 30 phones
• LAN with about 30 workstations
• WiFi with 5 Ubiquti APs (isolated from the rest of the network)

We're currently running a Netgate XG-7100. It mostly works okay, but I've had to apply a patch to correct a problem with FRR not responding correctly to tunnel drops. Also, we were getting intermittent IPSEC drops, but it would recover automatically after a few seconds. I asked our contractors to look at it and after a week of them working on it it now drops the VPN and does not recover itself... and to top it off they made a change to the VPN configuration that took the router down completely requiring me to drive into the office and work on a Sunday.

I'm admittedly inexperienced with BGP and pfSense, but every time I try to do something it feels like I'm the first one to ever do it. I was disappointed I ran into a bug requiring a patch immediately... I wasn't even coloring outside the lines. I know people have a lot of success with pfSense, but its not been great for me.

Can anyone recommend another router? Maybe one that is known to work well with AWS VPN?

I don't want to pay a fortune, but I'm willing to spend more if it means more stability and better support.

Thanks!