systemd gets stuck because it’s trying to mount two separate partitions to the same mount point

Uh… Sounds like it’s not really systemd’s fault, your setup is just terrible.

I’ve tried fixing it, but all I did was break it more.

If you’re unable to fix it, maybe get somebody else? Like, this doesn’t sound like it’s an unfixable issue…