I would say both, but perhaps Vocabulary is a little more important. English grammar is quite complex, and can be quite confusing, so it is possible you will loose enthusiasm trying to learn it. If you have a range of Vocab, you will at least have more words to practise and more interesting topics to talk about when talking to someone,