your little guy might be too old for this now, but this worked for me & may be worth a shot. when luke was about 4 months old, he hit those crazies & was up at 4am happy as a clam.
the basic idea behind w2s is that you go in about an hour before the habitual waking, as they should be in a deep part of the sleep cycle at that time. by causing them to stir, you move them to a lighter part at that time, and hopefully at the habitual wake time they will be back in a deep part, and will stay asleep.
now, i had no intention of getting up at 3am, so i decided to experiment. he went to bed at 8pm, and i went in to do w2s before i went to bed, sometime between 10-11pm. i would touch his head, he would stir, and i would leave. by the 3rd night, no more 4am wakings.