Yes to everything. This movie has small Stevetony moments but with huge significance. I love it.

Steve losing Bucky again was actually the worst possible thing

And the way he looked so lost, and I think he said 'I don't know' when Nat asked what happened (I remember this scene vaguely, feel free to correct me), I don't think I've ever seen Steve so clueless, he always looked like he had a plan, like he was in control. Very refreshing to see this side of Steve. His character development since CACW has been most amazing to see. It's like he's more real.