Decided to replace it with a brand new original one now. Got a decent quote for £1,200 to do everything and this means that I won't need to adjust my existing mapping or anything as it's a like-for-like replacement. I did consider an upgrade swap, but this comes with a lot more added expense, so couldn't justify it.
Thanks everyone.