Thanks everyone, i went and purchased two boxes of spokes (good deal, ended up with new cleats, bio degreaser, tubes, and two new rims... arg, i hate bike shops!). I did recive the exact same rim as i had, and have done one rim swap in the past.

I thing i'll build it correctly with new spokes today, i have only built two wheels in my lifetime, hopefully this time it wont take 2hrs

Not only that, when i was at the LBS, i got a job offer for bike sales / counter work. and some wrenching... I'm going to drop by tomarro afternoon with a Yes / No answer, the pay is lower then my current job, but it is a dream job... hmmm, discounts... I'll keep ya all updated