Just wanted to say you're not alone. My ds2 (dear son #2) started doing this at a similar age. We've taken 2 tactics:
1) Early on, we treated it as a night waking. Try to settle. Include nursing if needed (and it usually did
). Daddy would go in & try to settle him until at least 5:30. That's not where I want to end up, but I was willing to compromise to start. That's when I'd go in & feed. I could usually get him to nap again after that, till maybe 6:30 or so. (Remember, I'm counting this as a "night" waking, so didn't strictly use EASY.) And then I'd top him off at 7am, which is where I wanted his "feeding" day to start.
2) Lately, we're letting him fuss more (not scream or a get-in-here-now cry... more like a mantra cry), so I'll go in for a feed at more like 5:15, but Daddy isn't going in before that. So slowly, he's waking a little later. So far, that's going well. Watch. Now that I've said all that I'll have jinxed myself.
Good luck. And remember you may not have done *anything* wrong. Babies don't read the books, even ones as good as Tracy's.