That Marin was probably the Muirwoods 29er, wasn't it? That one is on my 'if I only had more money' list.

Okay, now down to business: Would you consider KHS?

1. In their Urban series, they have one w/discs for $519, the Urban Xcel. It comes w/ front shock, but you might get the LBS to swap it for a rigid at time of sale.

2. As for the budget road bike, take a look at their Flite 220 triple. msrp of $499, and it's steel!