In that case check out the stickies for diet. There is a link in there for the 7 habits of an effective diet. They will be perfect.
For really getting into fighting shape. I would reccomend that you buy Infinite Intensity or Never Gymless by Ross Enamait. They are both extremely good for fight conditioning. Ross is a boxing trainer who is a phenom in building conditioning circuits. Here is the link: http://www.rosstraining.com/products.html
If your unsure. Try out some of the workouts in his articles sections for a couple workouts.