These are all great suggestions and I agree would be a much easier fix than the instanced hami. A bud count and spawning at hami would really solve all the problems.
While I like the buds on the map idea, there's already 48 moving dots on the map, so it seems like it might be too much on the map, but I'd take it if it was offered.