i like your idea of infrastructure upkeep very much.
If you go this way maybe you should push it a lil further...
let the goldboni for tradepost, mines on gold, gem and so on, plantages be a lil higher, give it an upkeep and give farms, fishing boat pretty much everything one too...