Help.... Seeking a Duty Holster

I have the FNP-40 with the Streamlight TLR-2s Tactical Light and have had no luck finding a level 2 or 3 holster the holster that was issued to me was the Uncle Mike's Pro Duty 3 but it only fits the gun (barely). Any ideas? I would like to carry the gun with light not separate.