As long as you are adding outlets, add way more than you think you will ever need. I would triple what you mentioned. At least 2 4-plex outlets per wall. In my area, about 10 by 12, I have 2 four tube fixtures and still need the extra light from the lighted magnifier.

Folks give me a hard time about the 8 four tube fixtures in the garage, but when I turn on the lights, I can SEE! There are also 4-plex outlets every 4 feet all the way around the garage, except for the front where the door is. I don't hunt for an outlet anymore and it didn't take that much more time to do.