I think adding more checks on the kickstart are the right way to go with this. Also, I think it makes sense to keep the disk size in the ks, since the required space will only change when the %package selection changes. I've created Issue #79 for this.
anaconda-patches@lists.fedorahosted.org