Keep doing what you are doing. You seem bothered by the climbs but if your goal is to do crits your relative weak climbs are not relevant. Start doing some training races now. I suspect there is a weekly training crit near you.