Well i'll keep with the theme that you have rather then change it to a whole new deck..

Monster
1x Jinzo
1x Cyber Jar
1x Buster Blader
1x Dark Magician
1x Injection Fairy Lily
1x Magic Warrior - Breaker
1x Witch of the Black Forest
3x Gemini Elf
3x Skilled Dark Magician
3x Skilled White Magician
- 16

Trap
1x Mirror Force
1x Magic Cylinder
1x Imperial Order
1x Destruction Ring
1x Call Of The Haunted
2x Waboku
- 7

Spell
1x Raigeki
1x Dark Hole
1x Heavy Storm
1x Pot of Greed
1x Snatch Steal
1x Axe of Despair
1x Graceful Charity
1x Monster Reborn
1x Change of Heart
1x Premature Burial
1x United We Stand
1x Mirage of Nightmare
1x Harpie's Feather Duster
1x Swords of Revealing Light
3x Mystical Space Typhoon
- 17

Total: 40

Feel free to remove Lilly & 1x Gem Elf to add another Buster & Black Magician.
You could also add some Fusion cards + Black Paladins to make it into a Paladin deck ((Would be a better option since it's near enough there))