I'd say go 3 and 3 if you can. They're both really good ways to get what you need down and decrease set up time.
As is, having seen the OTHER Ibuki deck, I REALLY wish I had thought of Defender with her. I'm in the process of rebuilding my Ibuki as that's a really brilliant idea.