Yeah I had to use the droid as my answers did not agree with Mako. So I keep her back cleaning the ship.
Yeah he says "Excellent! I was just wondering what I could do to please you!" about 3 times a fight...
Finally I have my 3rd npc and that whole fiasco is behind me.
Keep the faith as Gault is just a short trip into Tant.