I ran into a similar situation a couple years ago. The washing machine was in a larger room with other outlets, and he wanted me to make all the outlets within 6' of the washer to be GFI. I argued and the head inspector agreed with me, there's absolutely nothing in the NEC to require that. Now I can't speak for NYC and I didn't read through your link to the Amendments, maybe there's something in there, but the NEC only requires outlets within 6' of a sink (exc. for kitchens) to be GFI, as well as other locations listed in Art. 220 such as unfinished basements, garages, etc. Also a 15A duplex outlet on a 20A circuit has been legal for decades, only if you have a single receptacle, not a duplex, does it have to match the amp rating of the circuit. That's old hat. Maybe your inspector will give you a code reference or reference to the NYC amendments that will back up what he's saying, unless I'm missing something.