Right on. What I've decided to try is instead of 5x5 for Bench, Squat, and Press, I'm going to do 3x5 with the third set being heavy and if I feel good I will shoot for a 5rm, then I will knock out 3x10 with shorter rest at like 60%. Pull-ups will be similar, 3x5 heavy, then 3 sets of as many reps as possible unweighted. I'm keeping deadlift at 5x5, I've found that to be my "sweet spot", and I do not like high rep deadlifts.
For assistance work I've been doing the Double Progression model that CT recommends. 4 sets of 6-8 or 8-10 reps, stay at same weight until I can knock out all sets at the top end of the rep range, then increase weight next workout.