That's awesome that you have made that decision. A bit of caution in your skydiving career can't hurt.
It's hard to pass judgement on anyone in this forum because we have not seen each other fly, swoop, etc.
I would say that your thinking is correct with starting with straight in front riser, then 45, 90, etc. If you jump at the ranch, I would talk to one of the swoopers there to watch you and ask for their advice. All of us can give you the best advice in the world, but we're not there watching you...