The only change I would make to your rig is to use a flat sinker rather than an egg sinker. That way it doesn't roll in the current. And use a heavier sinker if the current is strong.
"Life is a matter of luck and the odds of success are in no way enhanced by extreme caution." - Erich Topp, German U-boat Commander, 1943.
When in doubt, set the hook.