Aravallis: Is it still a good investment?

The Aravallis corridor feels like Gurgaon's last 'affordable' frontier, but I'm really not sure if it's already peaking. I'm so fed up of renting, landlord raised rent again, so finally taking the plunge. Trying to do the EMI vs rent math, and buying just makes sense now. I've been looking at properties around the Aravallis, especially Golf Course Extension Road, Sector 65, 66. Are there still pockets there that are genuinely undervalued for investment, or have prices shot up too much already? Should I be looking slightly further out towards Sohna for better ROI potential? Any specific builders or projects people feel are still good for a 2BHK/3BHK investment? What's the general sentiment on future appreciation here, will the infrastructure catch up fast enough to justify current prices?