Took delivery yesterday, confirmed AMD chip and Li-Ion battery (expected due to 165xxx VIN).
All is good with the post-delivery stuff, just 2 small paint chips and a slightly non-level panel which I'll have them take a look at. Thanks for keeping me sane and entertained during my waiting...