So now I have an upgrade which I am entitled to under SnS but cannot use because I would exceed the core count, even though I am fine under 6.7
You have >= 64 Core in one 2 Socket Host? (lucky guy for sure ) As you told us that there is active SnS than you will be fine because you can apply for additional free licenses (Support ticket needs to be open).
Regards,
Joerg