Re: Not all need to be recalled.
"I'll not be at all happy if VW try to modify my vehicle to enable THEM to comply with the law."
So sue them.
It's not your fault that the manufacturers cheated and if you are unhappy with the remedy, take them to court. It's unfortunate that you may well have a less efficient car than the one you were promised but as a non-VW owner I'm glad that they are going to be made to clear up the mess.
If you are unhappy then you know what to do. I'm sure that you will not be alone in this and a class action is a way of reducing the cost of litigation.
The best of luck, I hope you win.