I don't even count Cap 3 as a proper Cap film since they changed the direction of the film after BvS was announced.
The Russos pitched Civil War from the get go. That was always the film the directors wanted to make as the sequel to The Winter Soldier. Feige said no, then later changed his mind after the WB announcement.
If you watch TWS again you'll see that it really segues nicely into Civil War as we see firsthand how Cap gets burned by performing surgical strikes as determined by a corrupt committee of government mucky mucks and why we'd never agree to go down that road again.