What does installing ADSB have to do with the airspace set up? That is a completely separate mandate which I agree has cost issues.
Part 61 appears to be a balls up. Still not an airspace set up issue.
I agree GA has it tough, but I can't see airspace making any difference to that, unless Class E to 700' is brought in and you need to fit a transponder.