Astrolux S41 or Manker U11 clip anyone?

I recently got the Astrolux S41, which frankly is an awesome light and ranks up there as one of my favourites. But the clip is, shall we say, somewhat sub-par.

I can see that it was designed to clear the head when using the 18350 tube, but with the 18650 tube makes for a clunky clip that doesn’t work very well.

Does anyone know of a good solution here?

On my BLF A6, which looks like it shares the same tailcap I run an excellent Convoy deep carry clip, but sadly the S41’s tailcap has the grooves machined slightly smaller and the Convoy clip doesn’t fit it :frowning:

I have tried my Manker U11’s clip on the S41 and while not as good as the Convoy clip, is a vast improvement over the stock S41 clip. But of course, this leaves my U11 with no clip….

I’ve searched, but not been able to find a supply of U11 clips, does anyone know if these can be bought on their own?