Yup.  Thought I still think JK had a massive cop-out by saying "Oh, yeah, that wizard?  Totes-gay.  Honest.  Even though I didn't mention it in the book, where it might have done some good".    But yeah, trust me he loved to suck wands.