Taming the swirl of self-structured liquid crystal q-plates