Well the general consensus is to be consistant with pu/pd in order for it to work best BUT Tracey also said that pu/pd is not an appropriate tool if the bub is in any pain. SO I guess its really your call hun, a hard one I know! Perhaps you could try settling him in the cot for naps and after perhaps 30 mins or so you think it going ot be a no-go then resort to AP? It depends entirely on your LO, like I mentioned previously it never seemed to get us off track that much to AP but not all bubs are the same.
Sounds like nights are going ok considering he's having such a rough time cutting this/these teeth!
Sorry hun, not much help but I can assure that this too shall pass!
((((hugs)))))