[ファブリス]

How about doing both at once ? Using sample short phrases to illustrate grammar points and learn vocabulary. Somebody here had posted a link to his approach learning 10000 (!) sentence patterns, but .. noooo.. looks like its down at the moment :

http://alljapaneseallthetime.com/blog/