What I would much prefer is that we fix the horrible UI problem for WiFi.
Captive portals for logging into WiFi are a 1000% worse suck than NAT. They don't just change end to end consistency of IP addresses (which I don't care about), they smash up the TLS trust model which is something we should care about a very great deal.
Getting people to accept T&C is a logical requirement prior to joining any network. For IETF, T&C should include Note Well.