While I have a different router and a slightly different behaviour, I also experience re-connection issues with my ESP32 based gateways.
I have created a test build which, as a stopgap measure, solves my problems. It would be great if you could try out build SHA f09001 as well, so we can see if our connection problems might have a similar root cause.
Thanks