ok well - i wouldn't necessarily go into the room and actually wake him - i usually close her door when she is sleeping and to get her to wake i open it and make a little noise busying myself near her room - this usually works

bathing first to hold off the bf - i used to have this problem and solved it by after bfing when she was asleep i would sit her up to burp her, if that wasn't enough to wake her, i would talk to her and walk around with her for a few minutes and then go in her room and do the whole bedtime routine. it has been months since i have had this problem though - i guess she kinda grew out of it...
sometimes, if dd needs to go to sleep earlier b/c of a bad napping day or something i will feed her right before i put her down - if it's only three hrs then so be it! it has never affected her sleeping or eating through the night (i thought it would too.)
i wouldn't go back to doing a df if u already stopped and he doesn't need it, and i also wouldn't suggest a catnap - unless he hasn't slept well that day (ie less than an hour and a half)..and even then i might opt for an earlier bedtime myself.
another thought about the night wakings - it doesn't sound like it but is your lo too stimulated before bedtime? i find that after her bath (which she gets very excited for every time!) when i bf it calms her down quite a bit and then she is ready to sleep. just another thought to put out there for you.
i definately wouldn't do EVERYTHING at once - start slowly - what do u think would work for your lo best...try it for a few days, or a week and see how it works. if it improves sleep, try the next best thing...it if makes things worse than drop it and try something else - it is all trial and error...sometimes i would try something and then stop as it made things worse, tried something else which made things better (but not great) and then try the first technique again and it solved it...good luck - keep me posted on how things are progressing and if u have anymore questions!