Help - baby rolling

My son has been rolling from belly to back since 9 weeks. He started rolling from back to belly this past week and seems to have completely forgotten how to roll to his back and get stuck and frustrated. He was doing so well with naps but now he rolls after one sleep cycle and wont go back to sleep. I have tried flipping him but it makes him more upset and then he just rolls onto his belly again. I’ve also tried patting and rubbing his back when he is on his belly to try and get him to fall asleep but that hasn’t worked either. We do tummy time several times a day and I have tried encouraging him to roll onto his back but he wont do it himself. Any tips?!