Hi Pawkee
Thanks for the details. If there is a campaign (BMW's wording for a recall) on the fuel pump, it might be best to contact a dealer with your VIN and ask whether the campaign has been completed on your bike.
As for DIY fixing, the service plan according to the manual is below:
Service Plan
Check lines, wiring harness and plug connectors to electric fuel pump.
Check plug connector, wiring harness to DME
Check electric fuel pump
The symptoms are identical to what you are describing.
Kind regards
Ruan