RE: new routine
Yeah its enough, for example:
Bench Press 5x5
Military Press 5x5
Chest gets 5 sets, plus additional work from dips
Shoulders get 5 direct sets, then 10 more from the bench and dips
Triceps gets 5 sets, plus 10 additional sets.
Plus that hitting from all angles is bullspit.