I would see if I could find a "C" handlebar. They were used on the naked K bike models. It will be the correct diameter to attach the switch gear and throttle.
Unfortunately, BMW doesn't stock them anymore, so you need to look for one on eBay. Another alternative is Flanders. They claim to have the 22mm bars the K bikes need.