Double check the relay as well... could be a stuck micro switch internally.
the flasher unit in the late models is to the right of the headlight switch behind the dash.... not super easy to get to, but removing that knee guard panel there under the steering wheel (and the metal plate behind it) gives you a nice big opening to work with.