Yeah, I agree. The only thing I would suggest is that you drink more water. No, that's not a typing error--drinking more water helps to flush out substances that are causing you to retain water. But, a note of caution: Don't overdo this! Don't go over two quarts of fluids in a day.
Dietitians do know about TOM and water retention, so I wouldn't worry about it. It's not a contest!
Jay