For anyone reading.... I had, and still having this same issue.. but I'm making headway. I've found it helps to store thepreset you want to edit into the Matrix BEFORE you double-click on the patch (to edit it) in MQ.

Once you've done that, use the 'Get' function to bring it back into your Patch Editor list - then double-click the name to go to patch edit. The correct patch should now be available for editing.

When you're done, repeat the process just to be certain you don't lose it, i.e, store it back to the Matrix, then use 'Get' again to put it back in your patch-bank list, and save that MQ file before you mess-up again and lose it.

The other thing - when you're done editing, just click that little icon that looks like a graphic equalizer, to close the patch edit window which returns you to the Patch Bank list. I was having the same issue - once the patch edit window had opened  every patch I clicked played the same thing. But closing the window to return to the patch bank , then re-selecting the next patch for editing worked.

And if you can follow all that, then you're probably not having these issues to begin with ;-)