Well done

Yes trust the foil and gybe with a constant carve, let go of the sheet hand early and the sail will come around for you. The earlier you flip the sail the less likely you will need to touch down to change feet.
If possible sail out of gybe in switch stance (not sure how this will go with bung knee, but you got this far

)
Get this right, you can gybe back the othe way without having change stance. In swell I use this method to chase rides