I decided to take a few days off and went in to Cardiff with my wife today and called in to PMT. They never have best selection of basses, but the newly arrived Fender JMJ Mustang in roadworn black caught my eye.
After trying it (beautifully built, sounds amazing, plays easily and comes with a spare black pickguard) and with a bit of negotiation, it was mine.