Can you tell me which instances specifically these situations occur? I feel like I could just have a separate hotbar with those specific skills removed from the macro just for those specific raids/trials. Otherwise they are being used between GCDs whenever they are up like you suggested.