Good point. Also felt like too much time spent picking weapon would break the cool flow you've got going.
Wondering if having a quick choice between 2 weapons would work? That way the player gets some choice of build but can't always pick a perfect option.