I imagine that will be a future update. I bet, based on their experiences with CoC, that they have enough updates/tweaks mapped out to last at least a year.
So, I have come to the conclusion that it is nearly impossible to max out upgrades before upgrading your headquarters. The rate of stone production, storage, and raiding opportunities for it is too small.
I am playing this game because why not.. I am making more progress than CoC simply because I've nearly maxed out CoC and the loot opportunities are too small to finish things off... on Boom Beach the loot often isn't fantastic, but it can vary. With a few statue boosts last night I managed to raid enough to get my level 16 HQ upgrade going.. I find the most frustrating thing is the lack of shields as I lose too much resources when raided a few consecutive times.. it makes me just not want to play... but as long as you stay online and continue attacking you can generally get most upgrades done.