Maybe in the mean time we should just have another shortcut for the filemerge versions of these.

What do you think about  ctrl-shift-opt-a  ?

That keeps the standard idea of what the option key is for.