Limit combat macro to keybinds?

[Chamlotte]

For a long while i've used combat macro and it's been very good, up until Fyraak. It took a while to figure out that having a combat macro made the workaround, well, not work.

Would it be possible to have combat macro only apply when using a specific keybind, instead of all of them? I feel this would be a good futureproof way for any other fights like this, so i can just use another keybind to mount when using combat macro to roll or ghost wolf.