I'd go with Nissen. My Nissen is 7 years old. You should consider upgrading your radiator to the 540i type and add external tank... but I think you are tight on space now.