Hi James I would go with a system as quick as possible, the longer the boats over the more chance of water in the mast or a turtle, plus generally as you go over the boat swings into the wind and is in a good position to right without swimming everywhere. The longer your over the more chance of the mast swinging off the wind then the tramp catching the wind all of this is tiring. If you can just go to the self retracting righting line lean back get going again, you wont be absolutely worn out. With easy righting comes heaps of confidence to push the boat as hard as it can go because your not so aprehensive as you sail. Let us know your progress with the new boat because I am planning to get something similar for training at the club.
regards