You just have to realize that the Dev team can't spend an infinite amount of time working on just one class.

Sure an "overhaul" would be nice, but realistically isn't going to happen.

Just finding an idea that will fix the problem isn't enough. The best ideas are short, simple, and to the point.