Why wait, just do it. Kick the hell out of them. If I was you I would write direct to Nikon HQ with a major complaint letter stating the frustration and the losses that you are losing for their incompetence dealership service department.
And if that doesn't sort out you're problem then try and threaten them that you will write and article on any flashy photography magazine where normally Nikon advertises their products complaining about the way they dealt with you.
Don't forget to mention on the complaint letter that Canon is willing to help you with a brand new camera and a set of lenses for the upcoming shoot rent free.
Don't deal direct with dealers any more, they have proven them self that they are not worthy, you should go for the big fish.
good luck and give them the fire, for God sake.