The simplest thing to do is going to be to replace the motor with the same one that was in there originally.
Not only will there be no surprises; but in future if something happens you won't be dealing with a frankenstein with different parts from different years, models, etc.
Making more power via engine swap here would probably mean h22a swap ($$$$$), no other versions of the f23 are going to be worth swapping in. It's just not going to make much difference. And it IS going to cause you future troubleshooting issues as problems inevitably arise.
Keep it simple.
