Thanks for the advice!
I tried W2S last night and it didn't really work, but I'll keep at it for a couple of days and see. I must say that I'm not really convinced it will work since I had tried it last month to extend his naps and it didn't change a thing. He would still spring awake after 45 mins. Lots of shush-pat finally did the trick.
As for cutting out the DF, I would absolutely love to since I'm a huge fan of going to bed early. The only thing is, I'm really scared of my DS will start waking for an additional feed at around 1am. Should it risk it? Currently, he's only up once between 4am and 5:30am, takes a full feed, and then goes down again until 7am. I've tried diminishing the feed time in order to set the ground work for eventually cutting out the feed completely, but he will loudly protest.