Idea For Reaper's Shadow Step

Reaper is receiving some great updates, but Shadow Step is something I've been thinking about that can use some changes. The Issue with Shadow Step is that it is very limited in combat. The only uses for it are 1)getting out of spawn faster, and 2)Reaper-sitioning {;)} for a flank or to set up Death Blossom

My idea is a 2 stage movement, with the second part similar to the current shadow step.

Phase 1: Once it is activated, it will be a bit like Wraith Form, except Reaper will not be impervious to damage. Reaper will travel in whatever direction you are initially aiming(vertically included) at about walking speed for say 15 meters, think like a slow D.va boost without directional control after activating. You still maintain control of the camera during this phase, and you use it to utilize phase 2.

Phase 2: At any point before Phase 1 runs out, phase 2 is available. This works much like the current Shadow Step, but has a lower range and doesn't have a delay when he de-materializes, but still has a similar 'materialization' phase where you are vulnerable and immobile.

Phase 2 does not need to be used, and if you do not select a target to teleport to before phase 1 ends or right click to cancel, the ability ends and you fall like normal. In the current Shadow Step, the target is a shadowy circle. In this version, during Phase 1, the center of the circle disappears outward (basically becoming a thinner and thinner donut) to match how much time you have left to use Phase 2. Once you've traveled the 15 meters and Phase 1 ends, the circle is completely gone and you begin to drop.

This Idea adds more depth to Reaper combat, and allows Shadow step to be used to jump into battle. Phase 1 can be used to fluidly get over large obstacles and be useful for entering battle through say a window, and could even be used to save yourself from a fall, with or without using Phase 2 which does leave you vulnerable in the materialization mode. You can still take damage and can't fight while in either Phase of this, so it doesn't really overlap Wraith Form for escaping.

What do you guys think? Any suggestions or completely different ideas?