I guess you should calculate velocities for any band that crosses the Fermi level, whether one calls it valence or conduction band. For a system with a gap, you would perhaps need to consider the entire DOS, taking a more general definition of capacitance based on DOS as function of energy.