Improving quantum and classical decomposition methods for vehicle routing