Your proposed modifications sound okay, just be sure that if you want new enemies to count for modification you are making them different from the standard provided enemies in a significant way.
