So, how can I improve Ghostricks in two cards without breaking them?

[Lonk]

Ghostrick Tenembremancer

Level 2

DARK

Spellcaster/Effect

ATK 1200/DEF 300

 

Cannot be Normal Summoned unless you control a "Ghostrick" monster (but can be Normal Set).  Once per turn:  You can change this card into face-down Defense Position.  When this card is flipped face-up:  Change to face-down Defense Position any number of monsters your opponent controls equal to the number of both face-down monsters and "Ghostrick" cards you control.

 

Ghostrick Soul Swap

Continuous Spell Card

 

Each time a "Ghostrick" monster if flipped face-up, you can change the battle position of one monster your opponent controls into face-down Defense Position (If a "Ghostrick" monster would be flipped face-up during the damage step, change the battle position of a monster your opponent controls after the damage step has resolved.)  When this face-up card is destroyed:  Add 1 "Ghostrick" monster from your Graveyard to your hand.

 

Did I do a good job?