Keep new X1C6 or wait for X1C7?

Recently I've been searching for a personal laptop to decouple myself from my work machine (2015 MBP). After a few months of trying several options, I finally landed on the X1C6 with the HDR screen, which arrived about 10 days ago, and I absolutely love it - except for the speakers.

Since the X1C7 is due to be released around the beginning of next month with, among other things, improved speakers, I'm faced with the choice of keeping the X1C6 and waiting out the reviews for the 7, or returning this and buying the 7 when it releases. I'm struggling with the choice and thought I'd ask this community for your thoughts as I'm new to the Thinkpad world and have no historical reference for my questions. I'll preface this by saying my inclination right now is to return this machine and wait for the new one to drop, but I want to know whether that's a smart move.

• I run Linux on the X1C6 and it works wonderfully, however I'm aware that S3 sleep was only added to the BIOS some months after the X1C6 was released. Is this common for new Thinkpads, or is there an expectation that S3 will be supported on day 1?
• Is it ill advised to buy on day 1? I know that the X1C6 had some QA issues in the beginning that seem to be improved by now, considering the one that was delivered to me is pretty much flawless. Is this a common trend among new Thinkpad models or has Lenovo improved in that area over the years?
• I'm aware of r/thinkpadswap and r/thinkpadsforsale, but I'm concerned about resale value if I hold on to the X1C6 long enough for the X1C7 to iron out any initial flaws. I got this for about $1500 after tax during the April sale with an i5-8350U, 16gb of RAM and a 256gb SSD. I'd hope to recoup as much of the cost as possible, but if it's likely that the value on this model will drop off significantly, it's probably better to get refunded straight from Lenovo.
• Obviously no one can give an accurate answer for battery life, but is there a ballpark estimate for the 4k HDR screen with a 51wh battery using only an integrated GPU? The closest comparison would seem to be the P1 or X1E, but both of those have dGPUs that severely impact battery life. It's not my biggest concern, I could live with 6-8 hours as I'm generally not away from an outlet longer than that, but seeing reports of the X1E netting only 3-5 hours does give me pause.

I should say my use case is dual-purpose, primarily as a media consumption machine (hence the 4K screen and emphasis on speaker quality) and as a programming machine. I'm not using a DE, just bspwm on X, so scaling hasn't really been an issue on the 1440p screen and I don't expect it to be an issue on the 4K screen (previous experience with the XPS 9370 4K screen would support this).

I appreciate any answers and additional thoughts or advice. Overall I'm extremely happy with this machine, and the X1C7 seems to round out the last couple things keeping it from being my perfect machine, so I want to make sure I'm making the right choice before sending this back and being Thinkpadless again for a couple months. Thanks in advance.