The fireworks are complete. This season will be consolidation for both sides. Both sides under their bluster were no where as prepared as they would have liked.Give it time. Summer is here. Let's not be hasty. In a few months the situation would be clear.
Doklam, Ladakh have shown two trends.
India is increasingly under pressure to push back against China. The hyper media and internet enabled population wont let go.
The second, China is going to not let India stay focused on its growth. It will use border ambiguity to keep India unsettled. This friction will not go away till there is one of two major events - a comprehensive agreement on Border and economy (read India's support to CPEC) or open hostility.