Changing kits

Due to near identical Kits and no option to change kit before a match it's impossible to play some matches. I can look past the bugs most of the time but it's just lazy! Is there a fix?