I didn't want to wait for the new terminals to get here. If you're careful with the old ones, you can pop the out of the block without damaging them; then use what wire you have left and just solder a new connection from end to end and pop them back in. This is another reason why I hate those butt-connectors is they wont fit in tight spots like this.
I work mainly in DSMs (Eclipses, Talons, Lasers, Galant VR4s, and 3000GTs). You want to talk about wiring nightmares, you should see what some of those kids bring me. Obviously makes for good practice.