Keith,
Your water temp sitting seems a touch high. I sat in 400 traffic for 10 minutes two weekends ago on my trip to Southern, with the fans, it never got higher than 95. Take it from me, start with a CHECK of THE TIMING!!
Oil PSI hot--is that sitting? or moving?