If you can afford Fifita, and have the trades to move him back out during Origin (or happy to hold him through) then I'd do it. Katoa probably the best 2RF that won't be Origin affected. Nikora is the other one I have my eye on.
I like Nanai as well, but he'll be Origin impacted.