PS4 when I get one. Can't handle 2 consoles, barely time or dedication for one. And, being a person that doesn't exactly like to settle for weaker hardware and having only 2 options, with the cheaper one being the more powerful... Well... decision made easy really. Smaller, better looking hardware. Then there are the games. PS has my games.
Controller-wise, its easy ps4. Has more features and uses. The xbox one controller really has not many notable additional features. I am not concerned with the shape. My experience with the arrangement of the xb controller layout wasn't good, but I could adjust if I had to. I prefer the symmetry of the ps controller layout right now.