Think about it, the only reason Comcast is doing all this is so they can charge premium fees on certain services. If you don't allow them to do so (which is very easy to enforce, as customers can report such pricing policies), they have no incentive to be against net neutrality.
This is why the current status quo has worked for so long: ISPs have no way to legally make profits out of "premium" traffic, so they (generally) don't apply outrageous QoS measures. Money is the only incentive, and removing that incentive solves the problem without the need for active policing.