So I've done a little more work to the car now, I replaced all the cooling hoses, plus some of the leaking oil hoses.
It runs a lot better now, runs cooler, and oil pressure seems better.
My next step with the car is to get a new exhaust system, mainly because I don't have a muffler...