Hard to say exactly what the issue is, not seeing lab work. Something is off hormonally. It could be that your estrogen is too high. I would use an AI if you aren't. I didn't see one mentioned in your question. Arimidex at least at .5mg EOD to start. If you aren't going to get back on proviron, maybe add in some masteron, which is similar on sex drive but will also be anabolic and help to preserve muscle.
As for water, coming into a show, everyone is totally unique. Some need to cut sodium. Some don't. Some need to load water harder than others. Its all a unique situation. I'd suggest cutting water at the end for sure. Dyazide is my go to diuretic, if needed. using the smallest dose that will give you the desired effect.
Looks like you have plenty of time for your show. Best of luck.