Postgres "deadlock detected": Fix the Lock Order First, Then Add a Retry

Postgres "deadlock detected" (40P01): read the error, fix lock ordering with ORDER BY ... FOR UPDATE, and add a retry as the safety net.