If the issue is that large entities are using the software without contributing back in a way that goes against the "spirit of the law", the only solutions I can see license-wise are ones that restrict usage, which marks them squarely in the not-FOSS camp.

I do believe the line is inappropriately drawn, but I also have a lot of respect for what the open source/free software movements have achieved and won't spit in their face by trying to move the line or highjack the labels.