One trick that can help involves the jib. Assuming you have a pretty good breeze, (if not you wouldn't have gone over) angle the mast off the wind a few degrees instead of directly into the wind. Move the jib traveller on the down side all the way down. Grab the jib sheet ahead of the jam cleat and pull it tight. This should trap air in the jib and help lift the mast as you try to right the boat. Once up, let the jib sheet go so the jib is loose. This could be done in conjunction with the "bucket". I read this tip in the Hobie Hotline quite a few years ago and only used it once. It worked.

Howard