Yeah stuff like that isn't to foreshadow that Makoto's going to ditch her once he's more confident or that anyone could've done it. It's to reinforce the idea that the two of them are right for one another. We actually see how the relationship benefits both people beyond "they like each other and feel warm and fuzzy together" and how their support for one another makes them better.