If the fishroom ( basement) looks like a science lab, you are doing it right.
You can tell the Mrs I said so.
Angelfish fry ARE small but believe it or not, there are some that are too small for BBS. When you breed Tetras and Barbs, etc., those fry need infusoria first just to get them large enough to be able to eat newly hatched shrimp.
As I said previously, "Normal" Angelfish fry should be able to handle them from the beginning but today's fish are far from "Normal."
As for the plants, I find the bunch plants ( ie Anacharis, hornwort, java moss) do better for the fry than the solid big leaf types ( ie sword plants). As for moving the fry into the shrimp tank, I wouldn't. Try not to move them for the first 21-30 days if at all possible.
Good luck and keep us posted