those 2 problems go hand and hand dont they.running to lean= detination which you knock sensor is there to detect.

get a pressure regulator for you fuel rail adjust pressure to where you dont get detenation. and that should fix both those shouldn't it.