If you want to avoid the droid struggle part then maybe Pascal can tell Rin about some of the stuff that went down in the sabotage mission so he has an idea on what to do and dispatch the droids quicker, since they have a thread going about mechas right now that could easily be steered towards the droids. Sorry it's not an idea for avoiding the droids altogether.