Understand it is going to take a lot of time/effort/money to figure out. It sucks, but you'll likely need the lot resurveyed, you'll need a lawyer, and you'll need a lot of time of back and forth with the company AND the city.
I've dealt with this before... it's not cheap or worth it. That's...