Team-BHP - Front Brake Upgrade for my remapped Tata Altroz iTurbo

Hi folks, I own a Tata Altroz iTurbo, and am considering a front brake upgrade for my car. The stock brake setup is pretty decent with a good-enough bite.
After I got my remap done and gotten better rubber I felt that the stock breaks just were not it. They used to heat up quickly and just did not provide any confidence when hot.

I had switched from OEM pads to OEM replacement Bosch pads which were much much better in terms of brake fade and the feel. You could comfortably take ghat sections rapidly without thinking twice about the brakes (was not the case earlier).

As I approach around 43k kms on the ODO, I have realised that the rotors have started to show wear. On braking from higher speeds like 120, 140+, there is a noticable shake and vibration in the steering. This is only the case in harsh braking scenarios. I am unsure about the reason of this premature wear of the rotos. I figure its either the pads or maybe it's just me pushing the breaks where they were not designed to go in the first place.

I have been on the lookout for better brakes for quite some time now.. and here are the options I have discovered yet. And like most things Tata, aftermarket support does not exist!

Repeat stock rotors and search for better pads (ROTORS + PADS).
The stock size of my rotors is around 235mm with a OD of 20mm. These are truly tiny and definately not sufficient for stopping the 1.2 ton+ car. If nothingelse works this is my last resort.
Rotors from Altroz Diesel (ROTORS + PADS + CALLIPER)
Altroz diesel came with bigger rotors at around 254mm with a OD of 22mm. These look more normal and built for the car's weight. If nothing else, the larger surface area and volume with help me with brake fade and premature heating up of the disks.
Rotors from Nexon (ROTORS + PADS + CALLIPER + KNUCKLE)
The Nexon, across the board comes with 274mm rotos with OD of 22mm. These look beefy and probably would be a sweet upgrade over my current setup. The downside of this route is that I might have to swap out the knuckle to the Nexon's knuckle as well (which might not be feasiable)
Custom (ROTORS + PADS + CALLIPER + KNUCKLE + ELBOW-GREASE)
No experience in this regard but how do brake retro fits work? Does there HAVE to be a kit for your car which is bolt-on? Are there tuning houses that help with such problems?

Please help me make and educated decision for my brakes. I believe brakes are an more-than-essential upgrade and that needs to be reliable and done right.

Thanks and Regards