I doubt J-20 will still be produced in 2040s when 6th generation is hinted at reaching LRIP and PLAAF service by early 2030s if not sooner. J-20 production will scale down in the mid 2030s when 6th gen production scales up.
That gives it roughly 10 more years of production at around 120 units per year. They may even scale back production sooner than that unless for export lines.
Oh and yes, of course J-20 has EODAS, integrated ESM suites and offensive electromagnetic capabilities. Even the J-10C does albeit much weaker than the J-20.