Not sure which would be easier to manage or better in the long run WWYD?
I don't want to muddy the waters, because it sounds like the plan above really makes sense. But

, I just wanted to let you know, that even at 22 mo, when my DD has a short night due to teething NWs or an EW, she will still do the am CN and a longer nap in the afternoon. And similar to you, I was scared to do it because of the same refusals during the 2-1, but one day it happened by 'accident' and seemed to help her tremendously. Now whenever she has a rough night, I have confidence in going back to those 2 naps. The first one is always 20 min in the car as we go out to do errands, but the second is in her crib.
So . . . I agree with Lan, Claire, and Wendy: if you are nervous about the 2 naps, go for that longer morning nap and see where it takes you. However, if you feel like it's not as easy to manage in the long run, you might give the other way a try as well. Just my two cents!