I get all my drills and taps from McMaster-Carr. Great company to deal with. Never let me down, and they are very quick to ship items out.
www.mcmaster.com
You'll mostly be after a 3x.5mm tap, and you'll need a 2.5mm drill for that. I always like having a couple on hand. Never know when one might break, or get plugged up.