At this point I believe the only solution is a constitutional amendment, not a mere legislation, given that pro-arbitration laws/cases have been ruled as constitutional.
A lot of SCOTUS opinions in general seem pretty clear that they wish Congress would act and spell out what they want to happen, because that sure as hell is better than running to the courts to decide everything.