With my Samurott, I really don't need Aqua Tail, when I have Waterfall which also has a high chance to flinch the opponent, but with Return... I might switch that with Night Slash... And the reason why I have Froslass knowing the moves it knows is because of it's Adamant Nature. Yes, I do agree with you that it has to get rid of Attract with Ice Shard, but I think Hail is a necessity for it because of its ability. And I really think you are right about Bisharp, haha. he really does need a work-over. Toxic I will, yes, change with Thunder Wave. But, with Swords Dance I will probably teach it Rock Polish because it's speed isn't that great.