Dear

According to me you can consider civil engineering due to these factors

1.Good opportunities in next 4-5 years not only in private companies but in govt sector too due to many good projects are in pipeline.

2. Good market value in India , Gulf countries and other European countries too.

3. Good salary package with your excellent skills and knowledge.

All the best

Ask yourself where'd you want to see yourself in future. Both the options are far different from each other. Both have enough scope, provided you pursue what you like. Don't get influenced by what others say. Do your research and see what suits you more.