Factory terminals to re-pin connectors?

Yeah, I've been tempted to just bring both of the factory dash connectors into one single modern one so that I'd have a pigtail that would come out with the cluster when I remove it. I might be able to just get a standard barrel/bullet style terminal and close it up until it fits around the pins.

The ones I have work fine, but since I want to run all new wires I'd rather have all new terminals as well instead of cutting up the old harness. If I can pull the entire old one and replace it that would be ideal as it means I could always go back to stock. Cutting up the old one wouldn't be the worst thing in the world, but there's really nothing wrong with it, so I'd like to avoid it if possible.