It sounds like rock climbing is your priority this year. If that’s the case, combine the two plans, but bias the combination toward climbing. Make Josh’s plan the base plan and pick what you need from the other.
It takes much less training to maintain fitness than to build it. (A general rule of thumb is 75%.) So if you drop your general fitness volume to a maintenance level, that’ll give you more room for what you want to focus on.