After seeing pics of Turbosahd's Shadow I've decide to replace 2.5l with 2.4lDOHC.
Lots of work but should keep me out of trouble.
Don't know when I'll start, but will post pics and updates when I do.
Look forward to lots of help and suggestions.