Can't help with the GW, as we went cold turkey! With the shh-pat, I think you have to give Elliot the chance to settle himself. If he's uncomfortable/in pain, he will certainly let you know about it! I would try to hold back on running in and the first 'wail and whimper', and see what happens. Let him cry for (say) 30 seconds, and see what happens. Listen carefully. He may be 'mantra' crying, and get himself back to sleep. My rule of thumb was, if I'm not sure whether my LO needed me, I could wait a while longer and see what happens. When he really needed me, there was no doubt from the tone of his cry! For me, the main thing to listen out for with my LOs mantra cry is that it didn't escalate. When he truly needs me, he gets louder and louder and angrier and angrier!
IMO, it's well worth giving him the chance to settle himself. In the BW books, especially once your LO has reached this age, we only comfort/help settle them as much as they need and no more. If you rush in to shh-pat whenever he stirs, you will certainly make a prop of patting - learning to settle himself back to sleep is one of the most important skills little Elliot can learn.
With regard to the early wakings, it could indicate that your routine needs a tweak, can you post it in EASY format? It is fine to use shh-pat and PUPD as needed... start out with shh-pat and resort to PUPD if it is not helping LO to settle.
HTH
anna
x