Have you looked for used bikes already built, you can find older bianchi's ss series relatively inexpensive, or jamis exile, there's usually good deals out there on used ss. It's alot more expensive to upgrade components than to buy already built. Even so if your gonna spend several hundred dollars on a new bike then hundred or so to add components, you should be able to find a good ss for 400-500, might be rigid but so will the fork that comes on the Diamondback in several hundred miles.
I know this due to my first ss was a cheap haro conversion that originally purchased for around same price and went through two cheap forks before actually spending the money on a decent one that would last longer than a month without ceasing up. Also began upgrading small parts like handlebars, stem, seat, seatpost, etc. and wound up spending in long run alot more than a good ss new bike would cost. Go used!