The 1080 is noticeably, if not far better than the 1070ti, so given the choice, you shouldn't have qualms about going for the 1080. With that rig you should have 144 FPS in Fortnite easily, but PUBG is another story as you may well know. Not familiar with the newest CoD.
The PSU looks a little...