I'd add both Toon Cannon Soldier and regular Cannon Soldier. Also, I'd use Wind-up MAgician and Factory to search Rats faster. Maybe Shark as well.
This seems like a good idea. The quicker you can get to your OTK pieces, the better. If you use Magician and factory, you might as well use shark. If you use shark, you might as well add the extra deck parts to the Wind-Up OTK.
Man, this deck should be called OTK Mania.