I would go with the LS swap as well. I did it and it does take some time, but the rewards were well worth the effort. I was lucky enough to grab everything from the donor truck to make the swap as painless as possible.