Is there a substitute for 2N5485?

I often wonder if there's a resource out there for finding the SMT part numbers for THT transistors - many have simply moved unchanged into different packages with different part numbers that often don't bear much relation to the original part number. Here the part numbers share the last 3 digits which confirms its the same part.
 
In this case both devices share the same data sheet so that’s easy but others do not which is a problem to solve.
Lots of examples for confusion, iirc a 2sk117 is a 2sk209. Certainly would help if Toshiba made mention of this, same goes for many others.