Glad to hear about another swap!
I'm about seven months into the process with mine, but getting awfully close to that first drive. I didn't want to steal John or Vlad's thunder, so I'm keeping on the down low until I'm finished.
The Renegade Kit has some good suggestions, but these are definitely many other ways to solve some of the problems with these swaps. Let us know how you're doing and we'll gladly offer suggestions and / or steal your ideas.