The code only requires the receptacle to be gfi protected. The code also states that if the separate 20 amp circuit to the bathroom is dedicated you can use it for the lighting and exhaust fans also for that one bathroom. Put the lighting on the line side of the gfi receptacle. Is his requirement for a second circuit for the lighting a local ordinance or his own preferance. If it isn't a local ordinance I would protest that he was missing when you quoted the job.
Ron
