Upgraditus and the law of diminishing returns are tricky things to balance.And this is the crux of the matter. Chasing an improvement is expensive and can possibly yield a significant yet still very small change in the overall sound. The decision is whether spending so much is actually worth it for the very small gains.
My own experience was four times the cost of my previous kit and yes I did hear an improvement but it definitely did not sound four times better, but I'm content with what I have now. It's all about killing those nagging doubts and the upgraditis bug.
You are best placed to decide what sounds right and acceptable to you
It's good to see dealers being so helpful as, understandably, they must be struggling these days to keep a non-online only establishment going.