I wouldn't worry about bodyfat at this point. Going from 16% to 18% is rather a precise measurement. How do you know this to be true?
Keep the lifts going up. When they start to get hard, add some carbs.
If I were setting your macros, I would take the protein down (150-160g), drop the fat to 70g, and fill in the rest with carbs.