@holiness4 I think it needs some pushup and rotational work.
You have a lot of bases covered with the proposed plan, but I feel like some additional chest work and rotational work would help.
I'd be tempted to do one session as you laid out, then have a B session of
Push-up 4 sets of 15
Clean...