Founders KBS clone - BJCP category?

Anyone have an opinion as to the best BJCP category for a Founder's Kentucky Breakfast Stout clone? I brewed it in November and bourbon barrel aged it for a couple months - it's drinking very well already and I'd like to send to a comp or two to get some feedback. The bourbon and coffee flavors are the most prominent, with the chocolate and a bit of the oak in the background. Since the oak is subtle (at least in comparison to the other flavors), I'm thinking that Category 22C probably isn't the best, so I'm pretty much debating between 21A or 23 (although I could be convinced otherwise if someone more experienced has a different opinion).

So, 21A, 22C or 23? Or something else?

Thanks!

Best advice I can give is drink it at its peak and enter it based upon that.