ok - i did not even notice that Tracy recommended wake to sleep for naps so i looked it up in the latest book and here is what she said:
"Instead of waiting for her to wake, go into her room at 30 min, because that is when she first starts to come out of a deep sleep (remember that sleep cycles are usually 40 min) Before she comes all the way up to consciousness, gently pat her until you see her body relax again. It could take 15-20 minutes of gentle patting. If she starts to cry though, you'll have to send her back top sleep with PU/PD."
having never used PU/PD myself i am no help if you need that - just thought i would type out the bit from the book for you.
good luck