man i went through all of this a year ago and come to find out i had blown the head gasket. i never had oil and water mix so the obvious signs were not there, but your car is doing the exact same thing mine was doing. i know that u hate to hear a possible head gasket on a new engine good luck!