I have been soldering for work and hobby for 25 years and I think I would still shorten the wire at the plug end.... I would only solder on the PCB if I had to replace a damaged wire.
Thanks for the link Integra, I've been wanting to get that tool for a while now.