Begging your pardon, but net neutrality isn't and has never been about traffic discrimination by type. That kind of traffic shaping is not only acceptable, it's desirable. Services with real-time requirements (VOIP, streaming, etc) can and should have priority over non-real-time services. I'm sick of people polluting the net neutrality debate with this misunderstanding and discussion on a site as knowledgeable as HN should be better. Net neutrality only covers discrimination based on source/destination and we need to push back against upset torrenters muddying the waters.
e2e encryption mitigates the impact ISPs can have when looking at the protocol/contents. But there is still work to be done to prevent them (without regulation) from having an impact based on source/destination without going the TOR (or similar) route.