Currently, haggling is supposed to be a risk vs. reward deal, but price increases are so much bigger and more likely compared to potential discounts, it's not worth investing skill points on. For me, it's either fix that or redesign it completely. In the latter case, this looks like a good proposal.