I can proudly say I righted my 20 solo and could barely believe it myself. My righting line is a rope with a loop in one end that I keep stuffed in my tramp pouch. As I flipped I climbed over the hull and sat on the dagger, then as I started to turtle, I dropped down to the lower hull and stood out on the dagger until I came up from half turtle. Pulled out my rope and looped in on the top hull, with my pull point being as high as possible. I knew I couldn't do it by myself, so I popped off and swam my hulls directly into the wind. My main was uncleated, but I left my jib cleated. I leaned back after gingerly positioning myself toward the end of the dagger. She came right up very so slowly when the wind got under the jib and main. I have a harder time righting the 16. I know, the stars were aligned perfectly. Wind, patience, and weighing 215 helped make my day. Felt pretty manly the rest of the day.
The jib trick probably helped you but I bet it would go over the other way in any decent wind. The 215 helped too