Firewall - Settings - Advanced - Skip rules when gateway is downhave you enabled that? If I remember correctly fail back didn't work well before enabling it.
FWIW, with the last update, there was a blurb in there about gateway failover. It didn’t sound completely related, but potentially related. Since that update, I haven’t had an issue with failback from what I can tell.