Well, as I have learned when connecting at other airports (such as T1 to T4 at LHR with a 40mn runway crossing), your remaining options can dwindle rapidly as time passes and it is indeed good to explore alternatives beforehand.

So, a few things to keep in mind:

• [*]
• [*]
• [*]
• [*]
• [*]
• [*]

The best option IMHO remains the airside shuttle bus, on which you had such an unfortunate experience. I would say that the first thing to do would be to go down to the passport control in 2D and then decide whether to take the bus or to walk.

I hope it works out fine for you.