I've found the Copan flocked swabs to work well for both applications (http://www.copanusa.com/products/flocked-swab/). For our studies we buy swabs that have a perforation above the head, so you can easily snap them off into a sterile collection tube.
This paper has some cool SEMs of flocked vs cotton swabs (http://www.ncbi.nlm.nih.gov/pmc/articles/PMC2916499/?tool=pmcentrez). Note, they are collecting spores, but you can see that the flocked releases spores better than cotton after extraction.