You are correct - your 2007 is a 58x. 2005-6 were still 24x, according to Lingenfelter's site (search on 'lh6 reluctor tooth', and a .pdf with all gmt3x0 v8s will be at the top of the result list.
That site also mentions that all gen-3 and some *early* gen-4s were 24x. Looks like 2007 was the start of the 58x reluctors, at least for the LH6. Sorry for the bad news.