RE: When do you do shoulders?
If you are finding that frankie's works for you then don't bother throwing in another day, enjoy the rest.
The shoulder work in this routine is normally done as part of the push day ie with chest and tri's.
If you feel you need a bit more then try the shrugs as part of the leg day. This is where I do my grip work static holds. At the end of the leg exercises I find that I can do grip work (and you could shrug) because my grip has not been compromised to much by the SLDL's and I can go to failure on the statics without affecting any other exercise (as well as still having 2 day recovery 'till the next pull set (assuming mon, wed, fri - pull, push, leg).
IMO don't bother with the upright rows at all. I hate the movement and you should be fine with military press and shrugs (and every other exercise in the routine wich also hit the shoulders, traps etc.)