Hi there,
I want to second EVERYTHING that Katherine said, she gave you a fantastic advice and I wouldn't have said it better.
There are just some minor things I thought worth mentioning.
If you are EBF then you don't need to aim for 4h gaps between feeds, not many BF babies reach that till later on.
Is the rolling still a problem at night? If it is I would try and give him as much practice during the day, just do it together with him during the day.
I personally never flipped DS back when he learned to roll, it was important for me that he learns to sleep in any position. I preferred to have a couple of nights with lots of crying and then him learning how to sleep through the turning. There is of course the danger of SIDS that I have to mention so it's up to you how you deal with it.
On that NW you had when he was awake from 2:10 till 3:50 what did you do to try and settle him?
Katherine was right that your DS needs more A time, I also think that he starts the day UT and ends it OT, so I would be focusing mainly on stretching the A times and getting to a more appropriate A for his age. You would do it gradually, upping 10-15min every 3-4 days. That's how long it takes them to settle into a new A and also prevents OT. I would keep the 1:45h A time for a few more days and if you are still getting short naps then I would up it again. It's very very important you are consistent with the A times.
There is a slight chance that he needs a full A even after waking up from a short nap. I think there are not many babies like that, most of then need a shorter A, but my DS was like that as well, needed a full A after a short nap. But it did take time to figure it out, I wouldn't conclude straight away that your DS is the same as it's a big risk and you could have a total OT mess in your hands.
I don't think I am adding much, because like I said Katherine has said it all. You are doing great already, within time you will see the changes as well and it will get easier.