try uppiong your fuel pressure if possible - i dropped around 5'c when i upped my fuel pressure by 0.2 bar as my expansion bottle would overflow at idle if left long enough
i have an adjustable fpr with a guage which makes life easier and an 12" fan in place of the standard job