@bluesky123 Bedtime is much easier to work on, so I would start there.
My LO is 10 months old and first wake window is 2.5-3 hours. At 6 months, her wake windows were 2/2.5/2.5/1.5
Her last window was always super short.
Before we transitions to 2 naps, her third nap was capped to 10min and...