Looks good to me!
Once you are doing the 2-1 we did the reverse- capped AM and long PM- but if that timing is working for you and you are still getting a fine bed time then i'd say go with it. If you are starting to get refusal of the second nap, or bed time fighting you can try switching the order. Also- i'd leave any major routine changes till after DLS changes..