Samsung LCD LN52A650 or Plasma PN58A650? Or is there another better option?

I'm looking to upgrade, currently these 2 Samsung options seem like the best choices in a price range I can afford ~$2K

The specs seem about the same and the extra 6" would be nice. Is the Plasma +6" is worth the ~$400 upgrade?

Background:
Working on my 3rd year with my Westinghouse LVM-42w2, it has its quirks, but overall its been solid.

I have an HD-DVD, TiVo HD and an HTPC as a 3rd 1080p source.

I have a room with decent light control and will generally make this a priority. However mid-day its definitely not fully blacked out or anything. No direct light/glare however.

I don't game, so that's not a major concern.

I think that's everything, let me know if I left out any key information. I'm looking for recommendations one way or the other or a totally new direction.

Thanks in advance.