The only way to solve net neutrality is to have more competition in the internet market place. We have too few companies competing in this market which gives them too large a monopoly over the consumers. We need to make it easier for new companies to enter the market to fight for the consumer which will drive down the costs and improve the infrastructure (speed).
I also think we should split these carriers into two, a common carrier that maintains the infrastructure of actual wires as a heavily regulated utility and a customer-facing Internet service provider that competes with other ISPs on that same infrastructure.