I was a little distracted as I watched this episode, so I'll have to rewatch. But yeah, they've really surprised me with his recent direction. I think they said at the end of the first season that they intentionally set themselves up with an unresolvable climax to force themselves to be creative with season 2. I guess they did the same from S2 to S3.

I must admit, I don't entirely get why he's back to the hitman work this season. Is it just that he gave up that big audition in season 2 and now he needs a better day job to pay the bills than lululemon?