Yes, you have it correct. I didn't move up to PME until I was on the FE map and had scouted Agadar.
And yes, when I realised I had Dictators Death as my story quest, I left it uncompleted and raced through the TE map to get to the FE map and scout Agadar. Once I had done that, I completed the...