Also a climber and cyclist, I'd drop the upper body work as its not necessary except for aesthetics I assume. Climbing will work core and upper body to a large extent that is necessary and plenty of climbers get jacked and skinny without any additional upper body work except for antagonist training(ie sharma etc). I climb 2-3x a week, commute 5 days a week 1 hour each way + intervals 2-3 times per week and then weekends are either climbing outdoors or long rides depending on season.