Aoyama on return to MotoGP