If you are still looking for ideas...
Have you thought about another sci-fi colonization book? Christopher Stasheff's based his universe on a very similar concept as yours, only it followed different veins in the genre. I would still would like to see an "outside of normal" polity formed, from the ground up, by misfits. You have to figure they exist in such a far future. Stifled trans-humanists and other than American (like Japanese, or Korean) SCA-like organizations. Various women who escaped from those magic-user breeding camps of neighboring nations to the Kingdom of the West, they might blame the Kingdom of the West for kicking off an arms race in which they are the factories. There are probably lots of people who would opt-out of their current life if the could. Even if that means starting over from scratch as colonists. It's human nature.

Hi, do you plan any changes regarding Ajha's involvement in the final fight in 'Embassy'?

I meant in they are pretty much enemies in that scene, and he knows who Rior is. (Rogue princess on a warrant)
Much later when they meet again in the mountain resort, they have a truce.

I could see three options to fix this 'problem'
1. Remove Ajha out of the embassy final fight.
2. Rior gains amnesty from the Empire. (Rael & Co. will NOT be happy)
3. Completely change mountain resort plot. (creating further possible issues)

My read in Lodge in the Mountains was that Rior was, well, mentally raping Ajha. That Ajha had no ability to stop Rior, possibly due to deliberate backdoors in Oner training that Princesses know how to exploit.

Holly

In the Embassy Battle, Ajha was an observer. He got into the fight at the end, when a fleeing trio decided to kill a few stunned FBI agents as they retreated.

He was not supposed to deal with Rior. That was Rael's job.

Rior was specifically picked and trained to sic on the Amma because she's so very good at mental invasions and manipulations. And like Rael, she very good at getting through shields. In the Lodge, Ajha's in a tough situation, basically he can't get his group away, so he's not about to start a war. Letting both Rior and Jade see that he's not here about them will minimized the chances of them killing his team. And maybe they can learn a few things. And Rior hasn't actually committed any crimes in the Empire, ditto the Fallen wizards and mages he's collected. If Ajha could recruit one of them who can open gates, Ajki would be delighted.

When I get that far, there will be a rewrite needed, to make adjustments for the stuff that's been written since.

You are right.
Maybe they stand under a 'do not engage' order by their superiors (due to completely different reasons).
Agni: "Ajha, you are a mere Closey, you are no match for Rior, leave action to real Oners"
Urfa: "You are to valuable, better observe, learn and report back"

Agni has been sending Ajha into dangerous situations hoping to get him killed for decades.

Urfa knows he has to send his people into danger, even the ones he really likes. So Rael goes, because she's the best. He barely knows Ajha, and unlike Agni, does not realize that he probably will get into the fight if he thinks he's needed there.

Right again. But only if Ajha is sent alone or with other disposables.

Urfa on the other hand, does not know Ajha well, but he knows that his Comet Fall knowledge and experience is invaluable. And also he knows that is none of Agni's flunkies, which makes him even more worth.

What does _Rael_ cover ?

Two novellas _Just Following Orders_ that may have been posted here as _Dirty Politics_ and _A Small Family Wedding_.