I have gone back and forth on this because both placements of AMATW have merits to me. Putting it before makes people ask questions which is good, and it does spoil the ending of Infinity War which is bad, but at the same time it spoils Avengers 4 anyway with the time vortex line from Janet. I'd rather not spoil things if I can help it in my watches, but it hurts my OCD...A LOT to have Infinity War, then backtrack in time to AMATW just to save the narrative on that mid credits scene. It's like the Slingshot episodes. 90% of them happen before season 4 starts, but in order to save on the spoilers of Daisy and Yo-Yo, you put them after the ghost rider arc in a watch. This might actually be the first time I split up a movie and its credits in my guide but I'm still undecided.
I've had time to think about it, and I'm pretty sure I'm gonna go with A&W (including the credits scene) being before IW on the rewatch list.
If it had come out before IW:
they could have kept the same credit scene, but just never cut back to the Pym family's ashes, leaving Scott's Quantum abandonment a mystery. Then maybe revisited the scene in IW or A4 to show that they were in fact snap victims.