You're still looking for nirvana. Sell that bike and avoid BMW dealerships. Buy yourself a new Stevlio NTX. Kids will look up to you, men will want to be you and women will want to have your children.
In Russia we have saying, "if it isn't broke, don't fix it". We also say, "if it is broke, don't fix it".