I’ve messed around with it too and I just cut all of that out. Because Qi’ra and Han kind of repeat the things they want in the speeder on the way to the spaceport.
So in your version, you have him find Qi’ra in the sewers and then hop on the speeder?