For the last year I have been doing basically the same thing.
I started the mass gain plan outlined in the PM and have been trying diligently to follow the lifting template. It is an O lift program and the only modification I have done so far is include bench 1 day and incline 1 day. I still am not 100% on the lifting template but I like it and it has simplified my life substantially.
My biggest problem is that I get into an overtrained state by doing too much. I like the weights, reps and exercises outlined and I don't feel like I am over reaching.
I look forward to reading additional responses
What we think, or what we know, or what we believe, is in the end, of little consequence. The only thing of consequence is what we do. -John Ruskin