Hey there, that day looks much better today.

How has your DS seemed? Did he always settle easily?
OT can cause EW (although it seems that your DS1 is waking DS2) but if you can sort the OT hopefully the EW may stop too. Have you tried resettling when your DS wakes this early? Do you ever have any luck getting him back to sleep?
So for those naps did you wake him at those times or did he wake himself? I would try to keep your day like this for a few days now so that your DS can adjust and get used to the new EASY schedule. Then, if he is waking at the 1 hr mark it may be worth pushing his first A time out by just 10 mins, so 2 hrs 10 mins and see if that gets you a longer nap. BUT... for now I would stick with the chages you have made and see what that brings. How does that sound?