It seems that widely deploying TLS 1.3 and DOH can provide an effective technical end-around the dismantling of net neutrality. So we should be promoting and trying to deploy them as widely as possible. Of course, they can still block or throttle by IP, so the next step is to increase deployment of content-centric networking systems.
Think Netflix/Comcast.. no hiding what that traffic is.