I'm thinking of ditching anything that resembles stall, besides maybe Rocks. I've noticed that I haven't faced entry hazards in my few wifi battles (though I believe you used SR), so I might go for Recover instead of Rapid Spin. My original intent, almost a year ago, was to try and build a Rain team. This might be a good sweeper for that, and it can carry its own weight even without Swift Swim.