Yep, heat method did the trick.  I'd also found since swapping the buttons that the upper right flipper wasn't working quite right - Swapped the buttons back and all good.  Turns out the button without the internal spring is a couple mm longer when depressed.  Go figure!