I was leaning towards B too. It's a kind of serious scene, for a not so serious character. The writer was to show that he can be clever when he wants to, and this is the first time we are really seeing it. I'm going to keep messing with it. The biggest complaint that critz give me is that my fight scenes are not fluid, so only one way to fix that is to keep poking at it until it looks right.
Thank you for the feedback, it's helping ALOT.