Honestly I doubt we're getting any real fight with the HKs right now, chances are that Pranks/Gunko will retreat seeing Luffy and Zoro.
It will be whole Loki freakshow hype, the moment Loki becames free, this will go crazy.
And he wont make either strawhats or HK his allies, he will attack anyone who stop his plans to destroy Elbaf.
Good guy or not, his mindset need first to get broken before change it back.
Yes I assume he is not the bad guy all giants pointed him out to be, but he is also not the "Good" guy either.
He is just the middle, has his own agenda to follow with make him a great villian for this arc.
To add the HK as trumpcards/sidepiece for this arc, make it better.
And the fact that there is still a mysterious men running around(could be Scopper) means someone will save soon the strawhats(Luffy,Zoro and Nami who will meet him).
What I want to know more is if Elbaf has elite giants.
Something like Hyo, the scabbards or 4 daiymo.
For being called the strongest nation, even with Brogy and Dorry, I need more powerhouse giants, monsters with dfs too.
I assume there is at least 1-2 very strong giants in heaven world, also around Brogy/Dorry lvl, if not even above.
Elbaf as whole Nation should be really strong, stronger than Wano or any Yonkou crew.