I got my cat (mostly) out of that habit by booting him out of the bedroom and closing the door. Now he almost always waits until I'm obviously awake, sometimes even until I say, "Where's my kitty?" then boom, he's right there.

But it sounds like you have a handle on it!