Early AM wakeup:
When my DD woke up at 5 or 5:30, I treated it as still night time sleep. So, if she cried, I did the pat/shh combination until she went back to sleep even if it lasted until 6:00 AM -- which at that point, I fed her (for feedings, see below). Then, about 45 min later of A, I put her to bed for her 1st nap. But, if she woke up at 5 or 5:30 and wasn't crying, I'd leave her until 6:00 and then fed and then put her down again 45 min later for her nap. I shortened (still do actually) her first A time to compensate for the early wakings. For some reason, even at the 6 or 6:30 AM wakeup, she still seems tired so I never extended her A time. Basically, she gets 3 hours of nap at this time. It's during her second nap that I extend her A time to about 1 1/2 hours and then on her 3rd nap, I again drop her A time to about 45 to 1 hour. It has worked so far. Even her last PM nap -- she sleeps for about 1 1/2 (though, on occassion, she does have the 45 min catnap).
45 naps:
When she woke up from her 45 min naps, I'd do another shh/pat combination until she went back to sleep until 9:45 AM. By this time, she'd be in her crib for a little over 3 hours. I figure, as long as she is still sleepy/tired, I wasn't going to pick her up even if it meant she'll be in her crib for that long. I did this consistently so that she'll GET the idea and to keep her on 4 EASY. I tried doing the W2S, and it was a hit or miss. It ended up frustrating me more than the pat/shh so I stuck with what worked for me. A combination of pat/shh/pat in the bum worked well for me and my daughter and that's what I have been using all along. I basically camped in my daughter's room for most of her naps. I found that while I was sleep training (especially the naps), my DD was always tired from being fussy, so the long naps were okay -- it didn't rub her of her night time sleep.
Also, I switched her to 4 EASY and dropped the middle of the night feed because she wasn't hungry during the day for all her feeds. When I dropped her middle of the night feed and put her on 4 EASY, she was taking a full feed. By the way, I always made sure that she had a full belly because pat/shh took so much out of her -- that's why having a full feed is so important. Otherwise, she doesn't nap well without a full feed. As soon as I switched her, her naps and nightime sleep improved dramatically so, there is a connection. If your LO isn't taking a full feed at 6 or 6:30, he isn't going to be conducive to napping well if he is somewhat hungry still.
You just have to be consistent in everything. patt/ssh (if that's your method) should be used to extend ALL naps including early wakings. Thought W2S if it works for you is an added bonus.
I still keep her 8:30 and 11:00 PM DF. Her bedtime is around 6:30 PM. HTH.