Thats fine. GFCI, within 6' of a sink. But nothing within 6" of your face?

I think it is over due.

Tamper resistant and AFCI.... I won't go there now.