They're both really good, but in the end I'm gonna have to go with 2, the characters were great, the conversion gel is a damn fun new edition, and aside from that freaking elevator shaft climb towards the end, it's hard to think of a part I didn't enjoy. Also Wheatley is brilliant