Sounds like you’ve completely turned your life around in the last year. Impressive stuff.
These both work very well…
http://tnation.T-Nation.com/free_online_forum/sports_body_training_performance_bodybuilding/do_this_routine_instead_of_that_dumb_one?id=4404649&pageNo=0