Well done.
I have not paddled in 30yr but went through the same thing, taught myself in a lake.
Things have changed a lot since then but I think the basics are still the same. The pros in here will correct me if not.
One thing that helped me was to understand that 90% of rolling a boat is in the hip turn.
You only need a paddle as a lever to give the hips something to move aganist.
That is why you can roll a boat without a paddle, ITS IN THE HIP TURN.
One good way to learn the hip turn is to practice in a pool. Get in boat put both hands on the pool edge, lay out in the water and just turn your hips to turn the boat.
You can also do a lot of reps this way without wearing yourself out.
This practice technique helps instill that thought in your mind and not depend so much on the paddle.
ie THINK - HIP TURN, not paddle move.
Another practice technique we used was to hold a PFD in your hands, flip and use it like a paddle.
I have also practiced this on dry land. Get in boat, flip, lay on ground, turn hips to get boat flat.
Worked for me anyway, had an absolute bullet proof roll in very serious water.
Welcome to C Boating - its like the mafia, once your in, you cant get out

Be kind, everyone you meet is fighting some kind of battle.