Good luck, and thanks for sharing your journey through the issue, Please post the outcome as well. Someday it will certainly help another unfortunate forum member.
VW said the goodwill is determined by each dealer, so I'd need to find a other dealer and see what goodwill they would offer and what their price would be as well.
Throughout this whole thing, they (VW and the dealer) have been incredibly shady about where the goodwill $$ actually comes from. They each point fingers at each other. When it is convenient to say the money comes from and is at the discretion of the specific dealer, that's what they say. When it's convenient to imply that it is a VW decision, that is what they imply.
So I emailed them back, calling them out on this shadiness and asked where exactly the goodwill $$ comes from.