Yes, the first option would be the best, but let's make the access to the super-elite and super-basic units available later than the standard ones.
Added 3 minutes later
And here's another idea: can we create a building that only improves a specific unit?