Naps!!! Almost 22 months old

My LO has been an ok sleeper, if he isn’t teething he sleeps well and if he is teething or sick or anything he does not sleep well. He finally has all his teeth and he has been sleeping through the night for about 3 weeks. Bedtime is usually 7:30-8 ish. But naps have also always been kind of an issue. He wakes around 6 in the morning and acts ready for nap around around 10 or 11 am. But he won’t always go down that early and if he does it’s too long of a wake window until bed because I have to pick up my firstborn at 12. So he gets woken up or doesn’t sleep long enough anyway and so instead I usually try to get him down for nap after we get home so around 1 but he has been waking like three times during his naps needing me to rock him back to sleep and then he often takes around an hour to get to sleep at night. Does anyone have any advice?