Well yay on STTN! And an 11 hour night is very good!
Probably will be a 2 nap day. We're finding 4 hours works best with him, right? Now, the thing is to preserve that PM nap you may not WANT that first nap to be very long, so you could push his A time since you're going to wake him you don't really care if he's OT. I might push him to 11 and see how he does. If mom says he's just knackered and puts him down earlier, that's fine, but we could use this earlier morning waking to really test his A time limits and see what they are. But that's up to you. If he sleeps well in the AM and then will still take a short PM catnap, you can do that if you prefer. My kid just would never ever nap in the afternoon after age 1 if his AM nap was more than 45 min. But if yours will, then you can stick with that pattern.