I agree, seems the upgrades would be worth the cost. I say go for it.