We gave up on using a stroller at all after our first trip (AF Damaged it) and just use a soft back carrier (can't remember brand but there are no buckles you just make knots on the straps). Way easier and less "stuff" to worry about.
We just bought/borrowed/rented strollers/carseats at some longer term destinations.