All the events from Z to SUPER are Canon here, except she didn't fall in love with Krilin, you don't take Krilin's place here, but you are a Z warrior, you two don't have kids. (If you want to add a kid, you can do it.)