Yeah it's never a bad thing!
I thought I went overkill...until I read yours!
I was fortunate enough to have input on the pre-wiring my current home also. In the loft I had them run a homerun 20 amp circuit that has only 4 outlets on it, the other wall switches and outlets are on a separate 15a circuit.