For those who want to know:

I am right. Had to change the Thermostat too. So after pulling the intake to do that I removed #4 plug and it is at TDC with the marks aligned as I described. Login to read more.