I decided to ditch the Lateral raises and the BB rear delt row and changed my shoulder routine to....

Shoulder Press 3 sets - 10/8/6
Arnold DB Press 3 sets - 10/8/6
Shrugs 3 sets - 10/8/6
Upright Rows 3 sets - 10/8/6

That should be good.