It sounds like you are making the right choice although I know it was a tough one.
I commend you for providing a home for a cat with potty issues, many people wouldn't do that.