There's no "warning light for coolant 'in' the motor" so not sure what you mean there...

Anyway, as far as reco/exchange options the simplest, easiest and prob cheapest is a new crate motor and change over all your externals IE turbo, pumps, injectors etc