Yes, it was the switch after all. The adjustment wasn't enough to make it work reliably. Enough to make it start in Park most of the time, but not always. Put in a new switch ($50), works great.