In the International Sail and Power Association, we use a heave-to, sail-to, heave-to method for upwind COB.
1) heave-to; you may actually drift back to the COB - as in your scenario
(DO NOT TOUCH THE SHEETS)
- on a beam reach until the COB is a beam.
- sail dead down wind (with sails sheeted in) until the COB is off the quarter
- gybe and head up onto a close-haul / close reach staying about 2 boats out until COB is off the quarter
3) heave-to and drift back to the MOB
This can be done by one person; there a a lot of sailing couples out there.
You never lose sight of the COB.
Being hove-to with COB on leeward side, the boat heels toward to the COB.
In heavy air - chicken gybe.
You do not have to touch the sails.
There are no flogging sails.
The life sling works well with this method.
It does vary from boat to boat.
PRACTICE, PRACTICE, PRACTICE.