Sterling,

from your info, this situation is definitely worth of firm but polite escalation. Can I also suggest that 'replace computer, takes 3 - 4 days' isnt a satisfactory response, push them, which computer ? what part exactly are they replacing ? And how does the 'computer' relate to your headlamp issue. And why does it take 3-4 days ?

And as fin8tive says, be sure to smile and be polite. Once they solve the gremlin, be sure to go find the service manager and tell him which service advisor or technician was most helpful....you might just get a 330 with leather seat for a loaner next time :-)