I have a similar situation in April. Flying CLT-MAD on AA metal then connecting to IB3154 with a 3.5 hr connect time. I'm definitely hoping for the S gate then bus to the plane. I would love to have a little time to catch a shower before the second flight!