A change in talon?

So I was thinking since Talon doesn't really have a close gap ability anymore. Perhaps Was thinking.. Could switch his q ability with his r ability.

So making his new R which was once Q bit stronger and keeping the ult the same when you swtich to q but possibly with a lower cool down.

but make him have energy. So when he uses his q ability it will take all his energy away and to gain it back by using aa to get it back by 10 up to 200 energy but once step out of combat his energy will instantly be full. His other abilities will cost energy and make his new ult which use to be his old q only take half cost of energy.

so pretty much take his Q as of right now and make it his ultimate and make it bit stronger. Take his ultimate of right now and move it to Q and give it a less of a cool down.