@nickseand Try extending those later windows a smidge to see if it helps with the one hour window.
Yeah, pick a time where it's "night time" (maybe 8-7?) And teach her it's night by keeping it boring. She might go down later than 8 some nights depending on how naps fall, but if she's asleep...