Random Units

You can make random units on a map but you can't put non-Creep units in a random table. Theorically one could work around this by copying an appropriate Creep and then manually making it identical to the Racial Unit you want. But talk about a pain in the ass. If only you could change what catagory a unit was so you could copy the actually unit you wanted and then make the copy a creep it would save time. Being able to select racial units for a random unit would be even nicer. Anyone know if either of these solutions are even remotely possible or have another shortcut that works?