So having watched a few of the City Streets beta videos, I think we are about to enter an interesting transition period:
First, its clear that 'City Streets' is running independently of the older NoA system, so Tesla are apparently running both the old "2D stack" (including the legacy NN) and the new "3D stack" (with the new NN that requires HW3). This is apparent by the hand-off between City Streets and NoA, and the lack of any changes in the behavior when the car is in the older NoA mode on freeways.
So, what happens when City Streets is more stable (later in 2021)? I'm guessing that at that point Tesla will re-work NoA into "NoA+" (my name), completely updating it to use the new 3D stack. This will allow the car to use the same sophisticated 3D stack for both City Streets and NoA that works seamlessly on all roads, and significantly enhance the smarts of NoA+ compared to NoA (better lane awareness, ramp negotiation etc etc).
Of course, NoA+ will requires HW3. So I'm guessing that at this point Tesla will branch the stacks/software. Those without FSD package will stay on the current NoA and HW2.x (which will become part of EAP in effect), while the combination of City Streets and NoA+ will become the FSD package.
Of course, they could package things differently (and probably will), but I'm still betting on the NoA+ re-write, as they will be anxious to retire the old 2D NN stack and move everything onto the new 3D stack (and thus focus development efforts only on the 3D stack).
(Note: 2D/3D names are not really accurate here, but you know what I mean .. the old non-integrated camera NN stack be the newer integrated NM stack.)