As Wi-Fi is gaining a lot of momentum in today’s networks as well as in future networks, new carrier-grade requirements are emerging to support future user expectations and provide high-performance Wi-Fi networks. In this context, we investigate several problems surrounding the design and optimization of carrier-grade next-generation Wi-Fi networks. In the first stage, our objective is to improve the Wi-Fi user experience and offer to him a personalized and seamless access to Wi-Fi networks and services. For this, we propose an extension to the IEEE 802.11 management frames to enable venue service discovery prior to Wi-Fi association while avoiding channel overhead. We define also a set of extensible service labels to uniquely and globally identify the most known venue-based services. In the second stage, we deal with network architecture and management issues in next-generation carrier Wi-Fi environment. More specifically, we first propose a novel carrier-managed Wi-Fi architecture that leverages NFV and Edge Cloud Computing concepts. We aim through this architecture to bring more agility and adaptability and improve user perceived QoS by placing network functions and certain services close to end-users. To address some major management issues in this proposed architecture, we then propose placement and provisioning strategies of Virtual Network Functions based on QoS requirements.