So as it stands, you're given a default hive which you choose to 'Evolve' into a specific hive (Shade, Crag, Shift)
I would like to suggest upon selecting a evolution path and upon it finishing evolving you're given one free mature variant of what the appropriate structure is.
(Crag hive gives one free mature crag upon it finishing the evolution into a crag hive, Shift gives a shift, Etc etc)
This will allow more strategies to be done without it directly affecting firefights (aside from base rushes when using a crag hive, which kind of is the point of it?)
This means that if the starting hive is in a very unfavorable position they can choose to go crag hive to help protect it from an early base rush, or they can choose a shift hive and echo it to a different, more favorable location.
Since Energy is being removed, either of these tactics would Slightly (or largely with echoing an entire hive) slow down an aliens expansion in exchange for more survivability.