The latest Chinese population data shows the country experiencing a seismic economic shift. We need to rethink our outlook for China. Energy stocks did better in June. Is the future improving?