I figured Naidan looked too level headed the entire time to be some minion of Xia Ji. It's even possible he isn't that loyal to the organisation or its goals, and is still his own man...Even possibly a leader of some sort.
I just hope the fight gets less blurry going forward, muh speed or not.