Remembered this was here and figured I'd wrap it up - I started using NVS and pinned my versions and it works perfectly now, not had to even think about it since.