I would recommend always having one nap that is long, ie. Lo wakes themselves or you don't cap before 2hr. That will be a godsend come one-nap time. Your day can still get longer, so you can push that first A time a bit more and APOP a short CN in there somewherr in the afternoon. I'd not worry too much about keeping that PM nap in the crib now, just take a 10-15min drive or walk or something at that time 8f you can.
You can alternate one and two nap days for a while depending on how he is going on a given day if you have the flexibility. If you do one nap, you may need to be able to do a 13hr night for a while given how young he is. When you do one nap days at the moment, he could probably go down a little earlier than 6:45 and that may help with the mornings.