The best way to solve this is to say that you can't move a piece right back to where it just came from, like the ko rule in Go. As for superko, I think the threefold rule works just fine.