The good thing about CTS pots is that the wafers inside the pot (the disc with the resistive coating and the solder tags attached) are often interchangeable for CTS pots of the same size and basic design. I did this to make an odd-ball dual-concentric pot with values that CTS do not make in this configuration. I just bought a CTS dual-concentric pot and some donor CTS pots of the correct values. If you really can't find a CTS 25K pot with the shaft length you require, chances are usually good that you can take a CTS pot of any value and with the style and shaft length you want, and replace its wafer with that from a CTS 25K e.g. one with a long-shaft.
Just be careful taking the pots apart and don't damage the resistive coatings on the wafers. It's a good idea to write the resistance value on the wafer (just above the solder tags) before taking the pot apart to avoid any mixups once dismantled and to avoid confusion when ending up with a pot whose value stamped on the metal case no longer corresponds with the actual resistance of the wafer inside.
EDIT: obviously if the two pots really are almost identical in construction other than the shaft length, then obviously you are effectively just swapping the shaft, wiper and screw bushing plate from one pot to the other. Take a CTS pot apart and you'll see what I mean. It's a lot easier than it sounds.
Andy.