I have looked at both of your Gadget decks and have some notes:
In general, Gadgets are an archetype whose strength is to pump out rank 4 Xyz monsters. Gold Gadget and Silver Gadget are the best in archetype cards to do so. (Cards like Infinitrack Anchor Drill and Tin Goldfish can help there as well.) Both should be played at three copies.
The other Gadgets (yellow, green, red) are there to generate advantage, since they search each other on summon, so you always have a rank 4 play in hand. They are often played at two to three copies.
For the extra deck, I would advise you to play cards like Platinum Gadget, Gear Gigant X, Drill Driver Vespenato, Divine Arsenal AA-ZEUS - Sky Thunder. Zeus is pretty much present in every Xyz based deck, because it is an unfair card.
For the Gadget - Machina variant, you should definitely look at the video I posted under your post in the Forum.
As for the Trap - Version, you should play traps that interrupt your opponent, otherwise u will be beaten in no matter of time!
Hope this helps.