For the fluid retention, getting into a pool will help considerably and do not drastically restrict your sodium. You have an increased blood volume right now and if you remember, sodium is a component of blood. If your body thinks you don't have enough to support that larger blood volume, IT will reduce the natural elimination thru your kidneys resulting in it leaking into your tissues.
How do I know this? Lamaze certified Childbirth Educator thru the Bowman Gray School of Med, RN, Doula- hospital, birth center, and home births.
I am soooo happy that all is going well with you in your new home. So much going on in your life but you are on top of it.