M25 to M22 tap faucet adaptor

My kitchen tap sprays. Luckily i found an old replacement end, but it doesn't fit. Seems my tap has an M25x1 metric thread, not the normal M24x1. Lots of the aftermarket faucets seem to have an M22 thread, but check that it's an internal thread.

One version which is a bit long (as a test) and one version with a flange in the centre (for UK taps which need to seal here)

In retrospect, I have a concern it may be slightly under-sized. If you have problems, scale X,Y to about 104%