PS3. The PS2 controller was already near-perfect, and for once Sony didn't change what wasn't broken.

Though I will say that the N64 controller was oddly comfortable for some games.