Just FYI on the crate. I taught mine to love the crate by putting treats under his bed, just everywhere in there so he would have to look for them. It got so he would cry whenever the door was closed, and he couldn't look for his surprises. Teaching go crate was a snap after this.
As for waking up early, besides the obvious potty break, maybe this will help him settle back down. Good luck, it gets better