hi there
welcome to the boards and sorry it's taken a while to respond!
I think your routine looks generally great and clearly so does your ds as he is sleeping through at 10 weeks! well done you
I think you could do with a bit of tweaking to stop him getting grumpy and overtired at the end of the day. If he is waking himself at 6 from that last nap then sounds like he is ready to have just a catnap. As a result I would bring your evening routine, bath, massage, story etc forward to aim to have him in bed ready for sleep by about 7 - 7.15pm. Most babies thrive on a 12 hour day/ 12 hour night, and at the moment due to him previously having longer naps you have a 13 hour day. When dd was tiny that last A time was just about bath, jammies on, bottle and then bed.
hope this helps
kathryn x