The "fix" to the WBC nutters will be extra-judicial, in that it happens outside the legal system. Fred Phelps will die within a short period of time.
The dude's 81 freaking years old! Nobody needs to start lobbing 165 grain projectiles at him. Just give him a double bacon cheeseburger here and there. This thing will work itself out!
We really don't want to bug the legislative bodies around the country to fix this particular problem. I don't know if y'all noticed but they're generally inept at solving problems. Fixing whatever corked up scheme they devise as a solution to this problem will take a heck of a lot more time than waiting for the Grim Reaper to tap 'ole Fred on the shoulder in the men's room of a remote interstate rest stop.
It's not worth our time trying to cook up a legal defense to this crap. There's like 70 of these nutters living among the 300,000,000 of us that know they're bat crap crazy. On top of that when you figure the country is 230-ish years old, populations double every X years, carry the 1, account for dips after WWI and WWII, etc. we've probably had 1 billion* people living in the US and protected by the 1st amendment and only these 70 nutters saw fit to do what they do.
Asking anybody to "solve" this problem is like asking for a gun control law that would have stopped somebody like that Cho idiot that shot up VT. It probably wouldn't work and if it did it'd be reaching way too far into civil liberties.
*: I did not do my math on that number.