you sound like me when you say that it pisses you off to drive it, knowing there's a fault. i know how it feels!
if you end up selling it and getting another r32/rb20, you're probably going to miss the certain good things about your car.
do the swap. otherwise you have to start from scratch again.
at least if you trust or know the wrecker/seller, you'll have a good investment on a healthier engine, plus spare parts