For your rival challenge use Vullaby and Rufflet. One of them must be used on every electric Pokemon you encounter and they must both be evolved by the 7th gym.