I'm a retired electrician and not up to date on codes (or wiring barns.) I know you can't have enough outlets or light near a work bench area. If your being 'inspected' though they usually charge by the outlet. There may also be minimum spacing for outlets.
I agree on the GFCI. It used to be you could get GFCI breakers. That may be simpler still.
I agree on the GFCI. It used to be you could get GFCI breakers. That may be simpler still.