You are right. ICAI is trying to bring major topics under one umbrella. This choice system is mere window dressing. All students will come under that umbrella in some form. This may lead to slight deficiency in allocation of marks but difference will not be huge.
Moreover, leave such petty issues. Complain only when anything is out of syllabus. All topics were well under the syllabus.
Taking your complain of shortage of marks in company law and debiting ICAI for 5 marks , still you have 95 marks to secure. Come on FCA (Future CA), no one secures more than 80. Focus on completion of syllabus rather than doing selective study and then complaining.