I ran into this with my 05' and after google search it lead me to this forum. Finally got around to replacing both of these sensors as per the OP I was gearing up for a long day of work with removing the upper intake etc...
However this ended up being a 30 min job (minus the drive time for getting ...