Looks good. Maybe think about adding dumbell press. One thing I do since all I have access to is a Smith Machine and dumbells, Upside down row with a weight plate on my chest/stomach (I guess you would call it, or Inverted Row, I don't know lol). Put feet on bench and a bar about 2' 6" off the ground or whatever would make you parallel with the ground when you are completely contracted during the row.
Are you standing or sitting with the Dumbell Upright Row? If your standind, try switching to sitting. You understand why I'm sure.