I thought I posted about your coolant temps being too high, but i guess i forgot to hit reply lol. The coolant temps are much better.

As for the WOT tuning, First thing is get your A/F's in line. Then once that is done you can start on your timing. The knock that's there now may be rich knock so it may very well go away. If it doesn't all you have to do is just retard the timing by however many degree's of knock retard your getting.

Also you may want to turn your coolant CEL down to around 210 or so just to be safe.