+1. And I think specifically the SKIP LOCKED Postgres feature is relevant for this -https://tnishimura.github.io/articles/queues-in-postgresql/
I have used nowait before to batch scheduled jobs together for a slow API call.
Moving everything to rq, and so far so good.
I wish you the best, but I cannot help but think you will regret that decision.
I've noticed that a lot of "dependency" problems on "complex systems" are usually programmer implementation problems. Changing the implementation forces you to review the original implementation (or throw it out) and fix the bug that caused you to change the implementation in the first place.