I agree with your main points ^^^

You DON'T need a shoulder day.

You NEED more rest.

You need less cables this or that, machine this or that. You NEED more good old fashioned barbell lifts.

IW