Help me with my first *and* ridiculous build

You're probably right.

I'd love the roadrat as a 1x9 disc braked urban thing that I could throw around, and ANOTHER as a fixed beater.

But then I'd have three bikes and my flat mate (who, umm, owns the flat) would definitely kill me :)

Sell the Condor when you get the new bikes. Alternatively you could just get a disc mount welded onto the Condors forks and buy a fixed wheel bike. Or convert the Condor to fixed an get a new geared bike with discs. Either way you'll have 2 bikes instead of 3. (Still more than 1 though..)

Are the brakes the only thing that bothers you about the Condor? Have you tried new brake blocks? Different calipers and levers? These things can really affect braking efficiency, might be worth trying to figure out why they have so little stopping power.