Warranty Issues w/Major Chain

I took my Toshiba Qosmio G-15 AV501 in for warranty repair about ten days ago. Yesterday I was told Toshiba had recalled the laptop and would not make the repair. I should come into the store and select a laptop of equal value. When I arrived at the store, with my 3yr extended warranty still in effect, I was informed that I could only receive a laptop of comparable technologies and that would be a Toshiba Satellite P105-A9337. The cost differential between the two is $1,000.00. Yes, the P105 has a more memory and bigger hard drive, but it does not have the features of my AV501. I called Toshiba to check out the story I had received from the retailer. First of all the AV501 has not been recalled. Toshiba will replace the mother board and repair the unit for free, but all the components will still be three years old and it will still use Windows XP. The P105 is a highly touted laptop with Windows Vista. Toshiba recommends the Qosmio G35-AV660 as a replacement for the G-15 AV501. The supervisor of the repair dept. lied to me about the recall and lied to me when I asked if Toshiba made a laptop like my AV501. He said Toshiba had stopped making laptops with those features.

What do you think I should do? Accept the P105, try to get the AV501 repaired by Toshiba, fight for the AV660? And do you like Vista?