Personally, I wouldn't bother building my own bike (again) unless I was going real budget or wanted something really special. Also, I think ~2000 is a sweet spot for out of the box performance/dollar value.
I'd suggest you testride a couple of bikes in your price range and see how you like them. You should have plenty of options at that price range.