Read in publication order. The short stories aren't important to read within the timeline. They'd be something cool to read later and realize "Ah! So that's what he meant there!" Only. I'd stop at Changes (book 12) and start reading the short stories and comics.
Especially don't read "Aftermath" and "Bombshells" before BK12.