There will be more available than there are now, but it will be even harder to get. If you find one now, buy it to ensure you have it for Mario and Xenoblade. Play Zelda while you wait and maybe try ARMs or Splatoon out if you are up for it. The games you want are landing near future, so it seems senseless to wait a few more months.
Or you can always wait until 2018 when the stock evens out. Your choice.








