Have you seen the work Matrix and Element have done on p2p.

https://arewep2pyet.com/

I have high hopes for this, its slow in development but its a difficult problem.

If they can get it to work it can reuse the whole rest of the ecosystem.