Not sure if this works in the original version or if its just a flighting thing. But it seems very easy to skip the trigger for the wavefight while playing casually.
I tested this on the console version of MCC yesterday and it worked on there too. Its crazy how something thing simple has been overlooked since 2012 lol! But this honestly would make the opening for LASO so much easier.