Pep Boys was a huge disappointment. They needed to special order the starter. Nothing "special" about their ordering, got one from quadratec myself. Got a relay too because their only like $10, so why not eliminate that possibility as well. Also ordered Torx sockets and bits from Amazon for like $25. (Needed the sockets for starter) Installed both. Wallah, intermittent starting issue GONE.
--2.5L owners with the vertical starter bolts--
It takes a good little bit of wiggling and coaxing to get the old starter out and the new one in. The Oil pan and exhaust get in the way. Don't panic, just take your time to find the right angle and wiggle combo and it will go in.