Farm-type building:
The most common Draenei building you'll see is this:
They're literally everywhere. It's the standard Draenei multi-purpose home.
Barracks-type building:
Every Draenei town has a barracks-like temple like these:
I would suggest using your Arcane Temple model and adding a second building in the middle "courtyard". From the inside of these buildings, there's an initial small building that connects to another larger room in the back seperated by a domed courtyard. If not, a highly modified High Elven Barracks could work, too, but barely.
Tower building:
Draenei towers look like this in-game:
You're best off leaving it as a single tower like an Orc one instead of upgradeable like the Human towers.
Altar:
Draenei use tombs for fallen heroes. The Gilnean Library would be a good start.
Tombs are usually adorned on both sides with statues like these.
Caster building:
Every large Draenei town has a temple in it.
I would highly suggest your Arcane Sanctuary model as a start because the general shape you made it strongly resembles the temples of the Draenei.
Aviary-type building:
The Draenei use faerie dragons as flying mounts. They're domesticated in aviaries.
The faerie dragons of Draenor are pretty large compared to Azeroth's. I would suggest using the Arcane Academy without its floating crystals and a shorter spire.
Workshop-type building:
The Draenei use large observatories like the one here:
Best suggestion I could give for this category.
Goldmine:
I wouldn't suggest using an entangled style mine for the Draenei.
They have a thing for mining. Especially crystals not gold. It's all they mine all over Draenor.
Shipyard:
Your Arcane Shipyard is a perfect shape to work off it just needs some Draenei flair.
Improvements -
Metropolis: For Tier 3, I would add some sort of purple force field around the building coming from the crystals. The important buildings of the Draenei all seem to have it.