It's possible, but if it was the case, I wouldn't expect Oro to use that scene.

Being beaten by a Sharingan is like a thorn stuck inside of him. Possibly the only thing so far he hasn't overcome.

If he was Oro, he's missing his usually chuckles too.

Like you said, funny if really was Oro all along. Those who watch the preview might get a definitive answer.