I'll be seeing it as well.
Rather than the speculation of Goose being killed off (again), I would more suspect a sendoff for Viper since Mav found support from him, as someone who knew and flew with his Dad, and as a mentor........and he went back as an instructor at the end of the original.