The answer to both questions is "Jofre". Raf Herrera exposed Olivares' vulnerability to pressure and inconsistent heart. Olivares might give Jofre trouble with movement for a while, but Jofre would get to him, break him down, and probably stop him in the end.