This x 100!
I think the Pilot mechanic will really force people out of the 5x2 set-up. You're ahead of the game.
Not up to date with the expansions but my Navy deck is also a 3x2 + 4 composition. I'm enjoying getting use out of sets I wouldn't have normally put 2 copies of in my deck.