I myself would definetly go with Tsorim.

But what about "mixing" in some special cases like that one above. I find Tsorim much easier and cleaner than Safot Softim biQarthadast.