Hi there Kerriam
Often when LOs start waking earlier we tend to put them down for the nap earlier to keep their A time the same each day. Sometimes this can end up perpetuating the earlier wake up. If your routine has been 3hr A for a while and it was working what you might need instead is maybe 3hr 15 on the first A to avoid the earlier waking.
To get back on track I would suggest moving the whole day on by 15 mins each day. It's possible a little OT might build up but this is just the same as a clock change which loads of people do every year. Day 1 no nap before 9am, Day 2 9.15am and so on until you have reached more like 10am or 10.15 for the first nap. When you move the day on you need to move everything, milk, meals, nap, bath everything as LO uses all they cues to know where they are in the day. BT will be shifting too. WU might not improve for the first few days but after several days you should see it come later too.
Once you have things in place perhaps keep to the 3hr 15 first A time and see what happens. It could be LO needs a bit more but you won't know that yet.
The night length is actually not bad, it's just too early to bed and too early to WU. 11hr night are OK. When one of the naps shortens you might get a longer night again if you used to get longer. Some LOs are able to do 12hr night, some just can't, so it depends really on what a normal night length is for your LO.
Hope this helps. See how you get on and let us know if you need more help or if you have more questions.