Welcome to the forum.

My opinion....? Take it slow. Fix the 3.1 and sell it. Meanwhile look for a deal on something that already has a 3.8 in it. Motor swaps are always more work than you plan for. Ask me how I know.