In your situation i would 100% swap in an LS or LT. I won't swap a working 1FZ-FE for one, but for one with a junk engine, you betcha.
Also, every engine swap I've done takes more money, time, and head scratching than planned for - but that's part of the adventure