Dont do B, shes not worth it.
You still have another hand so use that to kino

and/or use the injury to your advantage and get her to do things for you in playful way. Dont act needy or helpless though.
My only concern is with the comedy night. Is it wise to let someone else be (cocky) funny, only better? I would do a comedy night on a 3rd date/after you've f-closed.
The other night I was watching Cribs on MTV with a HB. I have a nice flat but at the time I realised I couldnt compete with this footballers crib. Strange, but I'd already f-closed so I didnt care much.
Take her up on her offer for drinks. Ideally change the venue to somewhere close to yours - keep your options open.