Regarding your pup's early wake-up time...try putting a blanket over the crate to keep it dark inside. That's what worked for my youngest.