Hi John 82:
Since elevating your feet when you sleep seems to help you might also try the yoga position (feet and legs up, form a tripod with your upper back/the back of your head and arms while holding your lower back) or one of those invert devises which hold you upside down.
I assume you aren't getting too much salt in your diet as salt can retain water.
A sauna can bring out a lot of toxins along with the water.
When you do the sitting meditations sit with crossed legs. This prevents the chi from going down into your legs and build the energy faster where you need it.
Walking and hiking is an excellent balancer. You can do the 7 steps or small universe while you are walking as well.
Just some ideas.
Agent B