I can't believe you still haven't fixed that!
I like the Radio Shack idea. You could extend the lengths of the wires using butt connectors or by soldering and then put a whole new connector on there that could still snap together. otherwise, you could just connect everything together withlout a snap connection.
Or if the dealer has the repair kit then you're all set.