18650batterystore has 30q in stock, they also have made in Japan 18650GA in stock. Unfortunately price is a little bit high but I think it’s still reasonable considering current battery shortage and supply chain issue.
I just checked and found they also have VTC6 in stock, which I prefer over 30q but 30q has better longevity. The store is very trustworthy and your charger should be good enough.
Also check Molicel p26a, much cheaper but a great performer. The best way to compare cells is to use HKJ’s comparator.