In my opinion, the entire weight section is redundant due to you doing pushups. Since you work more muscles doing pushups then you can doing all weighted upper body exercises put together then I would say it's best to do tons of pushups instead.
You can get all the benefits you listed from doing BW. I've been doing BW for over 2 years myself, people ask if I've been to the gym, but I've never set foot in one before.
Functional strength > Fabricated "strength", anyday of the week.