Glock 21SF Holster options

My buddy just picked one up the other day (w/ pic. rail) and had a hard time finding a holster to fit it. Blackhawk Serpa, and Fobus Roto-paddle are no go’s.
I read where Comptac is getting up and running with their molds.
Only other option I can think of is a holster designed to carry it with a light attached.

Anyone have a working solution yet?

I use a Safariland 560 and remove the insert that’s in the holster (where the two adjustment screws are). I replace the insert with the widest two shims and Loc-Tite the screws in.