I noted in my Acro P-2 thread that I sent a recent production 6360RDS to Chris Geist of Ghostmen Design to be refitted for VP9.
I can't rave enough about whatever it is that he did to make it fit. The holster I got back from him fit the VP9 with light and optic better than it had fit the P320 it was meant for from the factory. Buttery smooth, protected trigger guard, perfect engagement of the ALS mechanism. You cannot tell that it was ever modified by outward appearance.
If you are stuck by department policy using a Safariland holsters having him go through it may be an option.
@AMC The 7000-series stuff doesn't impress me at all. I have a 7360RDS for a G19 with TLR7. It seems cheap and flimsy. My guess is that is the direction they are moving towards in general though.