I'm waiting until E3 until I make my final decision, to be honest. Microsoft said from the get-go that the reveal was going to be more about the console than about the games, and that E3 was the gaming conference.
Right now, I'm giving a slight edge to the PS4 based on what we already know, but it's a very slight edge.