I done the same as you. Beat Valefor pretty easily but I had to use Zanmato on Shiva.