I would go with option 2 if you are definitely going to favor 2h over polearm. 18 agi and 6WM gives you 150ish (153, maybe?) wpf, and typically 18 agi and 6wm is regarded as the "average." With the recent meta being agi builds, the average wpf is probably closer to what you get at 7Wm and 21 agi, which would be 172 or so.
That said, option #1 will only slightly change both your 2h and pole efficiency, since the numbers only differ by 10-15, which as you noted is not much of a big difference. Also, should you start to use poles more and find that you like them more than you previously though, then you will have more wpf in the category you will be using most. What I would recommend is start your build by only increasing the pole wpf, and only use poles right off the bat. Then, when you are a higher level you can decide how much you like poles compared to 2h. If you hate poles, stop adding pole wpf immediately and crank up the 2h wpf. If you find you like poles more than you would have expected, then aim for either option #1 or maybe just go pure pole.