University and Blacksmith utility in Post-Imperial games and new units proposal

I've playing a lot 1 vs. CPU in post-imperial age, and i can't understand why the University and the Blacksmith are available to build when all the techs are researched.

I think both buildings deserves a common civilian unit. For example, for the blacksmith:

• Smith (Blacksmith, Feudal), civilian unit equiped with a hammer. Can restore siege units and buildings faster and buildings when he's garrisoned.

New techs:

• Conscripting (Town Center, Feudal), smiths receives the same upgrades of infantry in the Blacksmith.
• Repair pier (University, Castle), docks can garrison up to 5 smiths to repair ships inside the dock. Ships must reach the dock to beign repared. It's like to have 5 villagers repairing at the same time.
• War hammer (Blacksmith, Imperial), smiths can inflict more damage against siege weapons.

For the University, a jester or troubadour could be fine.