The first of the two could also work given the last time we see the Master Codebreaker (or in this case the “”“Master Codebreaker”“”?) he seems to kind of just be an ordinary asshole.
Yeah, when I first saw the movie in cinemas, I assumed he was misdirection for that exact reason, and this dude in the cell with them was going to turn out to be who Maz was talking about the whole time.