Hmm, interesting. I would have thought Longsword/Shield, as seen in Garland's appearance picture, so yeah, that sounds right. 

Just watched some more vintage GoT, particularly the joust between Loras/Gregor. And remembered that the latter actually fucking decapitated a horse in one fell swoop. Holy balls.