With the multiverse pretty much dead it won't matter much for this, but it can be made cannon with other multiverse stuff even if some minor details about the battle might change such as the exact location of this underground cave they fought in.

EDIT: Although you probably wouldn't want the loss of his original suit canon. As I said, some details may be altered.