The solution has been, is and will be to free the market for smaller ISPs to compete without being regulated to death; and this will not change until economies are no longer a thing due to human extinction and/or reaching the singularity; certainly it will not be because AT&T, Comcast et al grew a conscience.
During 8 years of Obama the only thing in the table was more regulation. Now your only hope is for a Trump administration that pushes for more competition; which given his policy on healthcare I'd say that's a battle worth fighting for.
