I got a call back and he said that due to all the inconveiences that i went through, they are offering me the $2500 mbp as a replacement. He also said that since I had a matte display, I can pay $350 and get the 17" with antiglare screen.
I think I'll stick with the new 15" one. I'll call them later in the day and let them know.
Thanks to all of you for helping me out with this. I was going to send in my old machine to be repaired... but calling them several times seems to have worked. its all about finding the right agent