Sounds to me like you have a good plan in place!
Our dd has reflux and the only time we used pu/pd we actually only did p/d and that was when she learned to stand in her crib. We'd just lay her down gently and pat. We still use modified pat/sh too. We incorporated certain things into her bedtime routine. Like once she's in her crib I shake out her favorite blanket (her lovie) and I kind of wave it back and forth over her before laying it down. She giggles when I do this and has come to look forward to it. I then say the same words I say every sleep time and I have an aromatherapy (mild, safe for bubs) spray I mist over her bed. This also makes her very excited now. I stroke her head a few times, if she rolls onto her tummy right away I stroke her back, then I say night-night and leave. The reason I'm giving you all this info is when I have to keep going back in to try and get her to sleep, I just repeat most of the things she has come to associate with sleep time. ie: I readjust her blanket, maybe give her a little spritz again, say the same words, then leave the room. I just keep doing her sleepy things over and over until she gets the idea. It's the only time we do these things so she now KNOWS they mean sleep time. Does this make any sense? Sorry for the long winded post... :lol:
Let me know how you get on.
Sharon