Imo a better option would be giving his W build a more defined role and some more spice. the Q build is incredibly more effective, fun and defined as now, it should be the same with the W one.
The stunlock build is also more characterized and fun (when you can use it without gimping your team).