To me, Net Neutrality means that all traffic (regardless of far end *or* type) should be treated equally.
The only fair way to allocate resources on a subscriber network is by doing traffic shaping based on the subscriber plan, *without looking at traffic type*.
Suppose we've both paid for an identical subscription. I use my entire bandwidth for streaming video and torrenting, you use your entire bandwidth for videoconferencing. Traditional QoS would give your packets priority over mine. Since we're paying the same, that makes no sense!
The ISP should shape both our streams based on our subscriber plans. As an optional step they could apply QoS to the traffic belonging to each individual subscriber, but that would only affect the traffic for that specific subscriber.