I feel seen. Diet Coke is my albatross, and it has all the hallmarks of a serious addiction. I'm currently going through another round to trying to stop, and I'm seriously always thirsty and craving it.
It might not be possible to kick both at once, but I feel like my life is better since switching mostly to coffee.
Good luck!