Definitely this. 4 cards deeper you can look for Rare Candy, Ultra Ball for Delphox, etc. I find Trainers' Mail to be huge for stage-2 decks.
Also, since you have Delphox which eliminates the downside to Birch once it's in play, I'd play those over Shauna. You should probably be using Sycamore...