I thought I read some reference to blocking off part of the water inlet to #1 cylinder and re-routing it farther back, but can't find it.
This is a common L6 problem, and has been dealt with by many manufacturers, but what has been done as a shade-tree fix?