Wow, Dakota. this is no fun at all.

As you already know, cats (and dogs) dislike having their routines changed, so it may take a long time for the appropriate adjustments to happen.

Why don't you give a shot to Traditional chinese Medicine (TCM) and try Acupressure for cats. I know this is an actual thing, and it would be worth a try, since this is something you can do yourself. the worst that can happen is that it doesn't work - but I think it's worth a shot. Google "Acupressure points for cats."