Why wait? Don't find the perfect diet, just start eating better now, and perfecting it as you go.
Adam's Diet is a good place to start. Here's more about it, too.
"Adam's Diet" - additional explication
Also, Berardi's "7 Habits" is a great plan.
The 7 Habits of Highly Effective Nutritional Programs
Follow up this reading with his Lean Eatin' I & II Articles from here:
JB's Nutrition
These are both plans where you don't count calories. I think that people who can do it without counting are better off, but some people need to count (like me).
The two programs are not mutually exclusive. Both are sound and you can easily mix and match (for the most part). With both, you limit your calories by virtue of your food choices. However, Berardi's focuses more on traditionally "healthful" ingredients.