Thanks guys for the detailed responses!

CX830 seems to be the best option as an individual flight but would require an overnight layover at HKG for me (don't really want to do a stopover as I will have been in HK 3 weeks prior to this trip). Going to keep my booking as is and fly CX840.