S/P wasn't working anymore and was getting him more agitated - if I shushed louder, he got louder and more hysterical, and if I shushed softly it didn't work! The pat has been annoying him for some time now and we've been doing a modified version anyway (shh-stroke).
Still dummy-free. DH asked whether we shouldn't give it back last night when everyone was upset from the PU/PD, but I'm determined not to backtrack. It would be a short-term gain and only give us more problems in the longer term.