Same thing happened to me a few days ago. I didn't wait for current to die since the wind dies too around sunset. I was stuck in slough, not freshwater. While there was still some wind, I put an oar into the oarlock, held the mainsheet and tiller in one hand, and rowed with the other. Sail plus the oar did the trick but I am still aching. I keep getting tempted to put an outboard on my sailing dinghy. But I did turtle it once and really don't want to do that with the outboard. Plus that's just another thing to maintain, will make it longer to rig the boat up etc... I think I am just going to get better oars. Feels good to not rely on a machine once in a while.
1978 Gulfstar 50'
Clark Sailing Dinghy 10'