Happy and May
Would he still remember their relationship? Sad either way.
Also, making it so Spider-Man was there and then he wasn't, in their memories anyway, feels similar to the whole negotiations with Sony
I mean, the closing scene is of him at her grave, so yeah, he clearly remembers.
It doesn't really make sense though, does it? Peter asks how Happy knew May, and he responds "Through Spider-Man." But if no one knows Peter is SM, of course no one would know May is his aunt, so how does he explain that away in his head?