Well well well, glad to see you made it back!
Unfortunately I don't know of any place that sell both with good selection. But Mr. Snuff has a huge selection of snuff, and snus and such, while still having a small selection of pipe tobacco.
I have always had to purchase separately to get the best of both worlds though. Just a necessary evil to enjoy both.