The Convert WAD to VMT... tool in Hammer allows you to fix the scale of non-power-of-two WAD textures after converting to VTFs and VMTs with xwad.