Jkurz, here is a 5 day split I think you could live with that focuses on core lifts, progessive overload, etc. It also has a bit of variety which I know you desire (me too). A nice calorie surplus and 8 hours of sleep each night are pre-requisites however. I'm also not sure if you've deloaded or done a strategic deconditon lately, but it probably is in line if not. Basically (and this is nothing breathtaking, or remarkable) start off with a weight you can easily do for 5 sets of 5 reps. You would be surprised at the amount of fatigue you can actually apply to you system even though you aren't touching failure and could use more weight. Ramp up the weights for 4-6 weeks and then drop the lifts to 3x3 when you hit a wall and when failure starts showing up. So long as failure doesn't show up in weeks 1-3, its a sure fire bet that fatigue has accumulated and a deload is likely in line. Then keep running the 3x3 until you hit the wall again. Then come back and see us. 
Re diet questions: I know you want to stay lean, but lets face it man! You already know exactly how to get lean. You just happened to diet indefinetly and eventually the body needs to convert those amino acids to energy because the cut was so long (a few years I thought I had read?). Anywho, i'm not gonna suggest eating shit foods, but for breakfast I just had 6 eggs, 6 pancakes with awesome syrup, a bran muffin, 2 large glasses of milk, and 6 sausauges. Damn was it ever good.
The routine is below and is something I would/have used with good success.
Monday
-Squats 5x5
-Power Cleans 5x5
-Pullups 3 sets
Tuesday
-Flat Bench 5x5
-Standing BB Press 5x5
-Dips 3 sets
Wednesday
-Front Squats 5x5
-Deadlifts 5x5
-Weighted Abs 3 sets
Thursday
-Rest!
Friday
-Incline Bench 5x5
-Decline Bench 5x5
-Skull Crushers 3 sets
Saturday
-Squats 5x5
-Rows 5x5
-Db Curls 3 sets
Sunday
-Rest!

Re diet questions: I know you want to stay lean, but lets face it man! You already know exactly how to get lean. You just happened to diet indefinetly and eventually the body needs to convert those amino acids to energy because the cut was so long (a few years I thought I had read?). Anywho, i'm not gonna suggest eating shit foods, but for breakfast I just had 6 eggs, 6 pancakes with awesome syrup, a bran muffin, 2 large glasses of milk, and 6 sausauges. Damn was it ever good.
The routine is below and is something I would/have used with good success.
Monday
-Squats 5x5
-Power Cleans 5x5
-Pullups 3 sets
Tuesday
-Flat Bench 5x5
-Standing BB Press 5x5
-Dips 3 sets
Wednesday
-Front Squats 5x5
-Deadlifts 5x5
-Weighted Abs 3 sets
Thursday
-Rest!
Friday
-Incline Bench 5x5
-Decline Bench 5x5
-Skull Crushers 3 sets
Saturday
-Squats 5x5
-Rows 5x5
-Db Curls 3 sets
Sunday
-Rest!