Holy crap! That whole fight scene in the onsen with Shigure NAKED was "shameless, pandering fanservice"...but hey, who are we to complain, right?
So, with this fight we're only left with Apachai who hasn't fought a member of Yami...but I get the feeling this would be resolved quite soon!