Any way to get Wi-Fi to auto-connect only to hotspots that don't require a captive portal sign-in?
I think updating to lollipop will do the trick. As lollipop continues using your mobile data connection if your WiFi connection is not connecting you to the internet. However, I have not tested this with connections that need you to login.