Forum:Machina deck, idk if I should bring this to tourney

I'm going to my first tournament Saturday and this is the deck I want to bring. I'm still looking for a 3rd Gadjiltron dragon, but my friend will lend me his for the tourney.

22 Monsters:
 * Machina Fortress x 3
 * Machina Gearframe x 3
 * Scrap Recycler x 2
 * Green Gadget x 2
 * Red Gadget x 2
 * Yellow Gadget x 2
 * Ancient Gear Gadjiltron x 3
 * Jinzo x 2
 * Machina Force
 * Cyber Dragon
 * Armoroid

14 Spells:
 * Solidarity x 3
 * Giant Trunade
 * Geartown x 3
 * Fissure x 2
 * Limiter Removal
 * Pot of Avarice
 * Book of Moon
 * Mystical Space Typhoon

4 Traps:
 * Ultimate Offering x 2
 * Dimensional Prison
 * Compulsory Evacuation Device
 * Magic Drain

Extra Deck: Chimeratech Fortress Dragon

I'm using Giant Trunade because I have a lot of continuous S/T's and starlight road is a pain so i'll side deck Heavy Storm. Call of the Haunted will be side decked too for Jinzo. What should I add in or take out to improve?