Wow, called that one - I thought he was basically the same from the trailer. 
Haven't watched the ep yet, but glad to know I guessed one thing right already!