Earl, I did this same install using Moncha's write up and I actually went to a junk yard and clipped the pigtail out of a Trooper or Passport (can't remember which) so wiring was a breeze. It looks like you've got it taken care of, and I know getting back in there and re-wiring it with a pigtail would be a PITA, but it's an option down the road (WAY down the road).
Glad it all worked out. Looks great.
"The major difference between a thing that might go wrong and a thing that cannot possibly go wrong is that when a thing that cannot possibly go wrong goes wrong, it usually turns out to be impossible to get at or repair."
-Douglas Adams, Mostly Harmless