I'm sailing a 76 Sol 18; I have the same issue.
My sails are original, the battens do catch on the mast.
When you get the hang of sailing the jib you will notice that when the jib inflates properly, the battens do not touch.
As you turn, Release the main 1st, keep the jib cleated until you're completing the turn and then release the Jib. it will inflate and pop to the other side. I'm a novice as well, I've just noticed I never have to yank the jib of the mast if I do it this way.