XHP50.3 HI 4000K, 6V 4A driver, 20° beaded optic, Sapphire glass from esslinger, the larger convoy switch with a custom printed spacer, black button and clip.
https://i.imgur.com/2zGYkTW.jpeg https://i.imgur.com/EbyE11W.jpeg
I'd still like to find another clip I like better, but so far I keep coming back to the press on convoy clip. Before this setup I had a Dr. Jones H17Fx with XHP50.3 HD and OP reflector. That setup went into an S8, which I think suits it a little better.
Yeah, this switch. I posted a longer reply to Adair below.
I'm glad to find someone else that likes the stock convoy clip!