Give Ted Blocker Holsters a call. They probably can fix you up with whatever you need. I have two of their 911T pancake holsters, one for my Nighthawk GRP, and one for a Springfield LW Commander. I had to have thumbreaks to satisfy departmental regs, and TB was about the only maker I could find that would do one for the Nighthawk. I did not get the holster made for the gun with the light attached, but I would imagine that they can make whatever you need.
The quality on these holsters is absolutely top of the line. Like orders from most quality shops, it took a while to get them, but it was worth the wait...
