That's a fantastic routine you have there!!

I agree with not waking her to bath (I only wake for feeds if munchkin hasn't woken by the 4hr mark) and maybe try bathing her around the unsettled time, 5pm......might help both of you get through that time in a relaxed manner