Best method to correct NameMapping/xpath after Object position changes?

Hi.

Some context first:

The app uses several buttons on a banner, stored in <div> elements. 
The Namemapping assigns these with xpath from left to right.
The question mark gets '//div[1]', the globe is '//div[2]' etc. to simplify.

One update later, the app has a new button put in front of the others in the banner. Now this button claims '//div[1]'.

My keyword tests don't notice this change at first and click the wrong button positions due to all of them shifting one place in the HTML. Nothing fails at first, because technically there's a button to click, just not the right one. Naturally, all of my test start failing soon after arriving on the wrong pages.

Changing every div index position in the Namemapping xpath seems like the obvious solution, but it becomes tedious when updates like these happen so often. I tried Self-Healing, but it doesn't always work.

Is there a way to automatically recognize and correct this?

Thanks in advance.