No worries Julianne . . we get it!
Dawn, I'm not sure about that nap. I've read that naps around an hour could be UT. You are really in that territory of having to play around with A times, so if I were you I"d keep experimenting. If you let him sleep for 1 hour in the am, you probably have to try a 3.5 hr A time after that. If you keep to around 40 minutes for the am nap, 3hours A time after might be good. But not sure . . you have to try a few different scenarios and it all depends on previous sleeps.
We've had another relatively good day with short am/long pm. Bedtime is still a bit wonky though, but we are coming off a bad weekend:
Wake - 6.35am
Nap 1 - 10.15 - 11am
Nap 2 - 2.25pm - 3.55pm
Bed - 7.35 but didn't go to sleep til 8.05!