This one seems better to me. I have mixed feelings about your mortar placement. It will mess with AI for sure. Which is good but its also really close to your wizard tower. Meaning a lighting strike could cripple your splash defenses.
i would go with the first one, it keeps all your storage's safe and in different compartments that each other so goblins cant get all of them in one go. that's just my view.