Navigation A or B

Working on a redesign of Really Good Emails. Lots of things to consider. Category browsing currently happens a lot more than search, so I'm considering reducing search in the hierarchy (B) but I love the layout choices that Designspiration champions with this grid layout (A). Thoughts?