I really do hope you're able to find a good fix! I remember having to deal with the same issues with my cats when we first got them, but that was literally a decade ago so I don't remember what we did 😭