Phew! Such a relief, after this week's bruising IQ and Listener, to have a fairly straight forward and pleasant puzzle - and no problems with the endgame either.
I agree with you. One complaint though. 6D includes "that've" which is inelegant when "that have" would do. The only excuse for it would be for a misprint of "that're". I assumed this was the case so had a misprint of "R" in the description. Very irritating.
Normally, when I see something as clunky as "that've" I immediately assume it's been crowbarred in to make an anagram or for an extra letter that needs removing, but in this instance it wasn't for any of those reasons - very strange 🤪