I'd say he gave you a QUALITY job.
A pump load/heater line wire job and a fireman's safety switch are the only way to wire these appliances.
I'd call his handling of your previous terminations a bonus

See Ya,
Kelly