My last two flights were LAX and PEK, in Oct and Nov. I don't recall the headphones as I don't use them, but I'm pretty sure I recall the Chinese wines being integrated into the regular wine list by then. (Your point #3). Anyway thanks for the observations!
Glad to hear CX is giving all F pax regardless of status (I assume you're not a DM) the buggy.