i also think the first.
OD and passing 2 levels can make a big difference.
Bear in mind you probably couldnt give 5 jr pops to him in practice without popping JS and maybe whatever other secondaries it trains.
also with od and passing you might get a HA and DR but that wouldnt be a bad thing and probably wouldnt cost much salary