If you like the 1FZ and feel more comfortable maintaining it down the road stick with it. We all have diesel envy in NA so many will probably say swap over. But swaps like that are always more work than they initially appear.
I had to make a similar decision a couple years ago and decided to...