I'm so frustrated by losing progress due to timeouts

Or you could switch from Reorder Ultimate 2 to Reorder Omega which offers three different versions of back-to-back behavior, including “shuffle incorrect” which I believe does what you want (I haven’t tried it myself). Or, if you don’t need the reorder functionality, you can instead use the Back to Back userscript.