I loved both of them, and I thought the friendly rivalry they had was well done, despite them not being explored personally beyond that particular scenario.

Heh. John and Shayera is/was my favorite pairing of the show for many reasons. Chemistry, development, banter, etc. I did like John/Mari, too. Heck, even Shayera/Mari perhaps.