Constraining the charge-sign and rigidity-dependence of solar modulation