Hopes for the upcoming LVP3 Tenyi Link

Now I love the Tenyi archetype and played with it a lot the past months. I like how it uses normal monsters as power plays and how it is a wyrm archetype (pretty rare sadly).

Now the one problem I have with the deck is the Synchro and Draco Masters. The Synchro, you usually get out besides another non-effect link so you still get to use the rest of the deck (Countertrap, field spell and all tennis in GY live).

But when you Summon Draco Masters, you could have summoned the non-effect Ogre. Draco Masters provides only battle protection but if you summon Ogre you can have protection for any destruction or target and have field spell and counter ready. It's simply not worth it to summon Draco Masters if the opponent has 1 negate. Same could be said about Shaman. She is the choke point for the deck, she has no protection and discards so if she is negated or hand trapped you can almost scoop. I wound up in these situations where I know I have to sit on monk because I don't have the out to their negate for shaman or Draco masters.

So I wish for the new link to be a simple and easy fix for this:

*Master Monk of the Tenyi*

Light Wyrm | Link | Effect

1000 ATK Link-1 | Top

1 Wyrm Monster

This card cannot be used as Link Material the turn it is Link Summoned.

(1): Tenyi Effect Monster on the field are treated as non-effect monsters

(2): If you control a face-up non-effect monster, you can banish this card from your GY: Target up to 3 Tenyi monsters that are banished or in your GY except this card; shuffle them into the deck, and if you do, draw 1 card. You can only use this effect of "Master Monk of the Tenyi" once per turn

A card with a similar effect, even just the (1) would be enought to solve the mentioned problems and would bind the whole deck together - something that is currently split between being active (mostly the effect monsters) and reactive (most of the GY for non-effect). The second effect would also be appreciated, as Tenyis tend to use their ED monsters up fast and they can't be recycled.

Like I said even if it just has the (1) effect, it would really help. Fellow Tenyi Players is this also what you want? Or is there something else that you would like the link monster to fix?