I think any real solution would require a hard fork. I've said it elsewhere and I'll say it again, the current algorithm makes this kind of thing inevitable. It will happen again.