Fighting as Raiden, all I did (literally) was jump from left to right of Shao's sides and hit him with the same combo. Combo, jump, combo, jump...
Took forever to beat him but he kept countering with the swinging up hammer so it was easy to get by due to jumping.