TIL that Chadley's VR battles use whoever is in your party at the time of entering.

So needless to say I unwittingly made Shiva a harder for myself by doing that battle back when only Cloud was in my party xD