Personally I would skip the heavy AA in the initial construction but leave deck space so that additional flak can be added later if it proves necessary. That way you get the best of both worlds. I don't think that Britain had additional modern 5.25" or 4.5" naval DP guns available in 1939 so this might be the only possible solution to the AA issue.
