My first thought is to decrease his A time. An hour is still a lot for a 6 week old. I would pull that back to 45 minutes at the most. That will hopefully help him overcome the short naps.
I would also aim for a 12 hour day. If wake up time is 7:30 am, I would aim for 7:30 pm to be bedtime (sounds like overall, he is overtired). You might consider cluster feeding at the end of the day... 3, 5, 7 then bed after the feed, and a dreamfeed at 10 or so.
HTH