Net neutrality should have been this, and only this:
> If an ISP customer has a plan that purports to give the customer B bytes of data per month and a data transfer speed of S bits/second, then
> 1. The ISP will not limit (unless legally required to) what sites the customer can use those B bytes per month with, and
> 2. The ISP will not throttle the user to below S bits/second when using those B bytes/month, except when necessary to deal with congestion.
If the ISP does that, they satisfy net neutrality. If they also give you access to their own services without counting that against your B bytes, or make deals to give you access to certain sites without it counting against your B bytes, that may be anti-competitive but as long as you still get your B bytes at S bits/second it would not be a net neutrality violation.
If it is anti-competitive it should be dealt with through the large body of law that had been extensively developed for more than 100 years to deal with such things: antitrust law. Trying to shove a subset of antitrust law into net neutrality just because a particular behavior that might be anti-competitive happens to involve in internet service makes no sense.