I know how you feel.
I'm still riding my 2012 F800 - which I love.
Any failure or expense in excess of 1500 - 2k though and it'll be gone - not worth throwing good money at it any longer
A smart and good friend of mine told me to keep what I have, as I have already sunk considerable money into it and have it set up to my liking. I can do a 400km day and get back on it the next day and repeat the distance.
I haven't advertised my sled, just some word of mouth, lots of interest but no offers.
In the end, I think I'll heed my friend's advice......for now....lol
As far as what I consider excessive charges for Freight and PDI, I do not like dickering as I fully accept companies need to be profitable but still be competitive and know what they need to sustain themselves. I have the option of walking away if I don't think they are being reasonable, which is what I will be doing here