Mace Windu and Ackbar Fleet Training issues

I found the workaround for the Mace Windu ship tutorial bug, but since that leaves the tutorial on Windu I now can't get the game to recognize that I've finished Ackbar's training to unlock Tarkin's. 

I could use help clearing the issue so I can advance please. I've tried all the standard troubleshooting steps - forced stop, clearing cache, uninstalling/reinstalling - and none of it helps. Except that now I have the journey guides won't battle bug too. 

My ally code is 737-721-954 any help would be appreciated.