Well, here's something you might think about:
You could run Ice Punch on Jirachi over Tbolt. It will take care of Dugtrio switch ins and of course Salamence with a Reflect up. Your only trade off is your damage output to bulky waters. Suicune comes to mind. I'd say usually you could just run a high speed Suicune with Roar to solve this, but you lose sleep absorption, and without Spikes, Roar overall isn't that effective. If you could think of a way to solve this without making too many drastic changes, I'd say Ice Punch Jirachi is the way to go.