I still say keeping the WIPs and Finished threads together is the way to go, Scott.
That way, you don't have to go chasing all over to find the finish on a build, or the build that goes with a finish.
Keep them as they should be, one thread for a given build
And Jake? Yes, just it in the Sci-Fi WIP section