98 obs radiator blew... what next

hey, my radiator on my m-ej22 obs popped today and it's time to replace. I will probably replace with OEM but should i swap to a ej25 radiator in the process? i plan to make the swap as other bits fail too, but for now just need the radiator.

i also plan to change the top and bottom hoses and get a new oem cap... anything else i should do while i'm at it?

cheers!