My mistake, I forgot to mention that my upper body day is intended to have 2 lifts a push and pull in the form of a chin up / pull up variation paired with the OHP & Dip.
I understand what you mean about 2 lift, etc. I'll go with this for now and incrementally make slight changes if necessary. I don't want to over think this.
If we command our wealth, we shall be rich and free; if our wealth commands us, we are poor indeed. - Edmund Burke