@nsummer12 Changing her diaper seems weird to me. Why does she need this at midnight-2am? I wouldn't even do water unless she asked for it.
Maybe time to drop the nap? It's early but not unheard of, yeah?
I know it's rough but I would wake her up on time at 8am, and if you do let her nap...