Jag uses a different set of guidelines I guess.
The usual guidelines for macronutrient intake is protein > 1g/lb lean mass, fat >0.5g/lb lean mass and maintenance at about 15 x your bodyweight.
You probably have more than 170 lbs lean mass, so at 240g your protein is actually perfect, right about 1.5g/lb. Fats are nice and high (I like to see fats up high), and since there is no guideline for carb intake, your carbohydrate intake is sufficient - but can afford to go up to support your gains if you need to increase your intake.
You may need to bring your calories up - you're getting in just over 3000 calories on that diet, which can't be much higher than your current maintenance (by your estimation, you're over by 300 calories a day). Try it and see; if you stall out, bring up the carb calories before you raise anything else. Don't worry about the percentages of your macronutrients - you were right to focus on the grams, and you're on the right track with what you've got set up. Nice work.
How's your training?