Id go with the zombie because im a fan
I know it sounds wierd but try drop a Kokki for a Mobius
he is absolutely awesome and provides that spell and trap removal
also -2 controller
+2 BoM way better in my opinion
maybe try a couple of morphs

Fixes:
- Enemy Controller
- Enemy Controller
- Creature Swap
+Book of Moon
+Book of Moon
+Metamorphous

Reasoning:
Controller only changes the battle position face up, while book flips the card down for other ways to deal with the card like Nobleman. Two swaps can offten lead to a bad top-deck card. Since you have 5 and 6 stars monsters in your deck it can easily be morphed into a Balter or a Ryu-Senshi. Hope that helped.

By the way, Can you r/f my deck for my? Thanks in advance. :)

~ Davis

I would suggest the zombie deck with these changs:
-1 ryu kokki
+1 tsukuyomi (pretty much every deck should play this now)

-1 creature swap
+1 book of moon
goats are to rampent in todays meta, swap most the time will be a dead card, just depends on situation.

-1 controller
+1 delinquent duo
yeah, that's just basic...

and hbk's suggestions are also good. Good luck with the deck and at the tourny.

Use Zombie: Fixes:

- Sinister Serpent
- TIV

+ Spirit Reaper
+ Tsukuyomi

Nice, 8/10, care you rate my deck in siggy?

-Shane