You should try a middleground version IMO. Keep current W, keep current stack system, but keep your other changes (MS, bonetooth, 10s on passive, E changes) . See how it evolves, then add your changes on top of that if you REALLY feel like it's necessary.