I think it's all been captured. The idea is sound; it's just that there is discretion of the judge to probably take these factors into consideration. As it stands, it potentially narrows the scope of the judge's discretion to use an aggravating factor.
For that reason, I'll be voting against it as well.