The X-Box 360 or PS3?

I've been holding out on purchasing a Next Gen system.
The Xbox 360 was clearly my first choice but with the Blu-Ray HD-DVD format wars put to rest the PS3 might be the way to go. After seeing the trailer for Final Fantasy Versus XIII I'm feeling nostalgic for the old Final Fantasy VII days.
PEEP the trailer, your advice on which Next Gen system I should go with is welcomed.