I have always drank to thirst, and never counted how much. Everybody is different so it would be hard to advise.
If you're concerned, cut back until you really feel the need.
Mini trampoline is good for lymph drainage, as well as just walking and there are several you tube videos that show facial massage for drainage.
When I was a kid I would jump endlessly on the spring-coil bed, on top of which my parents had put top-layer of thicker material. I don't know if you can find one of these where you are :)
https://www.universalmattress.in/pages/about-innerspring-mattresses