I carry a revolver on the job and compete in both SSR & CDP regularly. When I choose my CDP gun I went with a gun with no safety because there was none on my revolver. IMHO you should keep the two as close a layout and operation as possible. My competition setup is laid out the same as my duty rig. The only exception is that speedloaders ride at 1-2 o'clock in front of the holster and mags sit at 9 oclock opposite side of the body. I have yet to forget in training or competition which I'm running revolver or auto when it comes to reloads.