Would second going to both. CX is a nice lounge and the staff working there is top notch. My last visit (December 2017), I got there right before the lounge closed (was on the AA HND - LAX flight) and the head of the CX lounge came over to thank me for visiting and to apologize that I could only stay for 10 minutes because the lounge was closing.

I assured her it wasn't a problem and just wanted some noodles (can't resist Dan Dan noodles from a CX lounge). She offered me something from the bar and I declined and said it was too bad given the price increases that offering Japanese whisky with any age wasn't feasible anymore. She excused herself and came back a couple of minutes later with a glass of Yamazaki 12 that the had hidden in the back (presumably for VIPs -- which I certainly am not).