Hi John,
Good to see you again, glad to see you've had some improvement!
First, if you are happy with the current state of affairs, and baby is happy, don't change it.
Having said that, your ds is only sleeping about 9-9.5 hours overnight, and 4-5 during the day, right? So about 13-14 hours in 24 hours, which is about average I believe. If you want him to sleep a little longer at night, I think you do need to wake him earlier from one or both his naps.
For example, my ds (who is just a couple of weeks older than your guy) sleeps around 12 hours at night, and his first nap is just over an hour, and his second usually just under an hour. I know other babies this age often have a pretty short first nap (like 30 minutes) and then a nap of about 2 hours in the early afternoon.
If you try it, I would do it gradually, probably just for one nap at first.
With your night wakings, is he feeding at night, or does he resettle easily?
HTH