Junaid bhai sorry to hear your loss, Allah ki raza
here after market paint job very pathetic, they just do thick paint on thick base , full of orange peal.
Recently i came to know one workshop near Pepsi factory gulburg lahore ( its not Jawed ), i love their work, their denting work, base work, paint job and most important their finishing work, they used differnt grits of 3m papers for wet sanding than quality 3m compounds / polishes. trust me after their finishing job i didnt left any margins for improvments
Since your paint job already done so u cant make improvments in base work but still by finishing u can achive quite better outcomes like wet sanding with 3m 2k grit and machine compounding / polishing , by this you can not only remove orange peel , swirls but also regain lost shine Inshallah