I'd say totally separate.
Once a console cycle has seen it's EOL and has been discontinued, any sales after that should be separate. To go back and compare hardware from early gens to find it was different than how it actually played out because the hardware was rebooted much later down the road doesn't make much sense. It's not the same type of hardware either.
Same basically goes for software. The bigger problem with the software is that it's all bundled with the classic editions and it's simply part of the entire package now, and none can be purchased and added, so it doesn't really make sense to count that towards individual game sales from a discontinued console long ago.
Things have changed in the past couple decades with slim versions of consoles and game bundles, but to try and impose that on the distant past just doesn't make much sense.
PS1 - ! - We must build a console that can alert our enemies.
PS2 - @- We must build a console that offers online living room gaming.
PS3 - #- We must build a console that’s powerful, social, costs and does everything.
PS4 - $- We must build a console that’s affordable, charges for services, and pumps out exclusives.
PRO -%-We must build a console that's VR ready, checkerboard upscales, and sells but a fraction of the money printer.
PS5 - ^ -We must build a console that’s a generational cross product, with RT lighting, and price hiking.
PRO -&- We must build a console that Super Res upscales and continues the cost increases.
