Is there a reason you couldn't just increase 'MAX_OBSTACLES_ON_MAP' ? I think 
that, if feasible, could be the least complex solution.