Your diligence will get you the results you want. I'd suggest ditching the machines and go with free weights (except for cable machines needed for certain exercises). If you're looking for a full body routine, check out The New Rules of Lifting, by Lou Schuler and Alwyn Cosgrove. I'm nearing the end of the Break-In workout now and have been quite pleased with the results.
Per NROL: the weights are the tools you use to achieve your goals, they aren't the goal themselves.
Nice percentages - just try not to get too obsessed with them. Cheat meals are good in that they'll help you feel that you're not depriving yourself, and it will throw the body a curve.