My opinion is that you need a product that is both a dessert topping AND a floor wax.
Architects should employ all of the typographic advantages typesetting offers: Upper AND lower case, proper fractions, etc.
You probably need a third typeface, since neither of your current choices work for you.
Can AutoCAD use Multiple Master or Postscript fonts? Like real fonts and not stick fonts?
Without getting into a font taste war [that you would certainly lose] I would consider fonts like Kepler or Warnock Pro - complex, beautiful and reliable body and title serif fonts that were Adobe software registration giveaways in prior years. They have many subtleties and alternate presentations - italic, etc.
Get completely away from architectural-look lettering cliches. The had their day: Mr Hand got arrested for putting it where he shouldn't. Has anyone here suffered under a vanity typeface where the boss gets his hand lettering made into a computer font? GMWAS.
Dwight Atkinson