>>Is there a better setup for this switch?<<
Probably bunches of em, that switch isn't all that good of a design, and yes, you might have to do some solder-work....still, I'd make note of what connects where and how/why it works that way first.
But I'd clean it up real good, and then re-do all the connections, were I you..
-R