Think realistically im out too having been sat on the fence on one after a test ride.
I dont do pcp and didn't flinch when my 1200TE was £13500 in 2014 (available extras were pretty much alarm, luggage, spoked wheels and not much else) and my s1000xr £14000 in 2016, but its getting a bit silly now, anything they can get away seems to be an extra at inflated prices split out over about 3/4 packages.
It feels like a rip off at pushing 22k to get the bike how it should be with some luggage, and i dont like feeling ripped off.
I guess for the time being theres better bang per buck to be held elsewhere, might look in a couple of years when the bugs are ironed out, and they inevitably start making some of this stuff standard.