Yep... I would have to agree with Andre... much as I hate to agree with with him...
I would get my $1000 back and go with the other dealer if you dont mind the wait. Alternatively you could ask the current dealer to sweeten the deal to match the other offer. However... what if they get the new parts and muff up the install of these parts? Or the parts come in damaged? Or??
If you are going to start over... I would get my $1000 deposit back citing non performing dealer... and truely start over. Couple of quick calls to local dealers should get you a competitive deal possibly somewhere neare INVOICE (not to be confused with MSRP) and start the waiting game again. Realize that by doing this you will likely be approaching winter delivery though. Who knows though... maybe a local dealer has just what your looking for sitting on thier lot waiting for a buyer?
Good luck and keep your chin up... the grin is right around the corner... Cheers!