I hope you fixed it, but I think you may have changed your problem to something else that will crop up later.  Don't forget that you had this problem when something else happens.  When you took everything apart, you took apart the 2 wires that were crossed.  And they are either just waiting to come back together or touch something else.  If you start blowing fuses, look in the same spot and maybe the problem will be more apparent.

Paying the dealer to trouble shoot is very expensive.  They'll charge you by hour.  Better to narrow it down to a certain component and replacing the whole thing.  I haven't seen very many new style signals available on ebay, but the old style goes for $20.