I was having doubts whether Elbaf turns into a battleground or not, due to huge potential with 3 large levels but you convinced me otherwise with this post. Should have been expected considering that it is a country where the common folk isn't enslaved or oppressed.
There will be trouble but it will not last too long.
I think what further supports this is how Oda already created what's gonna keep some SHs busy,
There is a New Forest with Huge Beasts for Usopp to Train (Which was Hinted at when Luffy asked him if He could Defeat that Cat by himself),
There is a New Library for Chopper to Study & Train,
There is a New Vegapunk Laboratory for Franky,
There is a New Archeological Site, Ancient Texts & History Books for Robin,
There is a Beach-Like Area & Flying Ships for Jinbe to Master,
... etc
So while those SHs are gonna be Training & Studying, Remaining SHs are gonna leave,
Namely Luffy, Zoro, Nami, Sanji & Brook,