I think in the long term. We need to protect PM Abiy from growing power of FANO and TPLF.
This is where Egypt and Turkey could come in. Abiy's army are made up of young inexperienced Oromo teens. They are easily losing to FANO and had no chance against TPLF.
PM Abiy needs to build close relationship with Turkey and Egypt. They could help train his troops. Encourage Somalia and Eritrea to be supportive.
I think PM Abiy his the best man to rule Ethiopia for the time being.