Since you're so close to
Lachute Subaru, talk to Mark about doing your swap. Less headaches in the long run if you're like me and don't know yer way around a soldering iron.
I've spent some seat time in their handy work and it's sooooooo nice.
-mykr.