Both, I use Photoshop to tweak my drawings before I bring them into Illustrator. I spend most of my day in Illustrator I do all my tablet drawings and digital colouring using my Wacom Cintiq 21 UX which I use even more than my light box now! I still use Photoshop to apply interesting effects to flatter vector drawings, and for when I am integrating type with photography.
