What visa should I apply for? Q2 or a different one

I am an Australian citizen with a two year Q2 type to China , my wife is Chinese and we go to visit our family a number of times a year.
I am about to be employed by a Chinese company , I will work mostly in AU but paid from China, but sometimes I might be required to do work in China but not receive payment while in China.
I cannot tick two box when applying for a visa .
Should I just continue as Q2 in the future ?
Thank you
George