Well i finally got around to replacing the injectors and thankfully (after spending all that money) they were the problem. Only a little start up smoke now, no running smoke and a fair bit more power. Also lowered operating tempratures a fair bit, so it is clear the injectors were just dumping...