I forgot to add in about the good will... my thinking on them doing a good will replacement would be that they could still call it warranty work and get out of actually having to pay for the motor (Acura would pick up the tab). I'd rather Vandergriff pay for a motor and put it in, and cover it under the same 100k warranty I had before, and NOT deal with the hassles that come from having a good will repair.
If the engine does get replaced, I will also request that the old one remain in my possession...