The Shockwave safety with a pistol-gripped brace is not a natural combo, due to having to move one's thumb around and above the grip in order to disengage the safety.
I would go Remington, add a +1, big-head safety, maybe tinker with some better internals/springs upgrades, and be all set for adding a pistol brace when desired.
