Which Leica M-mount lenses are best for street photography?

So I have been obsessing over my packing list for this Tokyo trip in three weeks and I am totally stuck on the glass situation. I am bringing my M10 and I have got about 3500 dollars to spend on a single do-it-all street lens but I keep going back and forth between two very different setups.

On one hand, I am looking at a used 35mm Summicron-M ASPH. My logic was that 35mm is the classic focal length for street and it is so tiny that I could basically walk around Shinjuku all night without my neck killing me. It is easy to zone focus which is huge for me because I am still a bit slow with the rangefinder patch when things are moving fast. But then I see these incredible night shots and I wonder if f2 is going to be fast enough when the sun goes down in those narrow alleys.

That leads me to the second option which is the 50mm Summilux ASPH. I found a decent deal on a pre-owned one that fits my budget perfectly. The look you get with a 50mm Lux is just so cinematic and I love that extra stop for low light. But I am worried it might be too tight? Like if I am in a crowded market will I just be getting headshots instead of the whole scene? I have heard people say the 50mm is better for more deliberate portraits but maybe it is too restrictive for general street stuff where you want that environmental context.

I also briefly thought about just grabbing a Voigtlander 35mm f1.5 and saving like 2000 bucks to spend on actual travel and food but I keep telling myself that if I have the Leica body I should probably stick with the Leica glass. It is a weird mental block I have.

Basically I am torn between the portability and ease of the 35mm Cron versus the rendering and low-light power of the 50mm Lux. Since I am going to be on my feet for like 12 hours a day which one would you actually want to have glued to your camera...