I think the manga has alot more to go. It's like he's still in training and there's going to be a couple more huge happenings in the plot. Or at least I hope so ;____;
I think there will be a doumeki/watanuki ep. In classic clamp style it looks like a romantic build up for them. Remember, before clamp hit it big they did alot of yaoi comics.