If any of you are interested, I took my bike back to the LBS and they told me re-true and tension and a few new spokes won't make it completely straight and I will need a new rim soon (I figured). So hopefully I can get a month or two out of it before I have to buy a new one. But I'll probably buy a set just in case.
$34 for re-tension, re-true, stress relieve and all of that jazz.