Yeah, I was actually thinking about adding U-Turn somewhere, but I didn't know where exactly, since I never had a real answer to Azelf/Aerodactyl leads. It's a stall set, so I wanted to keep Roost, but at the same time I need Taunt to prevent set ups whenever possible.
I'll also take the EV...