Looks like NACH and Mr.BB already covered most of what I would have said.
Nolva won't do shit. A diuretic is the only thing that will really help, since the problem isn't due to estrogen (aldosterone, most likely).
I doubt your liver has taken much of a hit at all. Certain steroids just cause lethargy in certain people. Dbol makes me lethargic from the get-go, so it has nothing to do with liver strain. Try lowering the dose for at least a few days and see if that helps.
I would never recommend stimulants purely for water retention, as they aren't very good diuretics and can cause a lot more issues.