He should start gathering other base materials, like wood from the forest. And pots to carry water on his inventory. Also I would make different shapes of golems, like something with lots of flexible arms/tentacles with big and blunt tips (morningstar-like) or a giant snake. And if he makes weapons as part of the golems (like a mace on their hand) it should regenerate even if it broke because of an attack.