...
There was a strong consensus that we should NOT compromise the "with add-on" UX but make it the best possible UX (even if this means that we go a bit more radical). We agreed, as As Ashish said, that "making the experience similar [between the two] was a 'nice to have' ".
Action Items
...