question- how tall are you? you seem quite light for a male.
nevertheless it sounds as though you need to be eating above the current 2800 calorie level that your at... but not all foods that you eat have to cause water retention(due to more carbs, as it water is stored along with the glycogen). Depending on your intake of EFA's and protein you could perhaps add more to there.
Put up an outline of your diet and Im sure we can tweak some things for you.
So are your goals to continue to gain LBM? (muscle)