Not just you, I still ship them them ridiculously hard. IDGAF about canon. I also shipped them before the The Avengers though in other universes, so nothing's gonna stop me! hehe
Man, I totally agree about all the Endgame talk. The way they keep talking in these interviews about how her solo film is supposed to somehow explain stuff that shouldn't need to be explained leaves a really bad taste in my mouth. Endgame happened, we're stuck with it, and trying to justify it after the fact because they saw all the backlash is just tiresome. Let people feel things, let them have their opinions. No matter what they do in the solo film it's not going to change my feelings about Endgame, nor how the MCU has treated its female characters.