So not too long ago

Gypsy made a post about reworking Azir. He talked about everything wrong with Azir's kit and how it was too good at too much, i agreed with him. He then talked about how there were two possible ways of reworking him. One to make him more immobile, remove the shurima shuffle, but keep his range to make him a full poke and zone mage. The other way was to lower his range, keep his shurima shuffle, and make him a lower range battle mage.

Which would you prefer? I like his shurima shuffle so im going battle mage.