Add 1 more comment bout option 1.
Because you'll end up with an engine with mixed internals (and you've already mentioned you'd like to continue keeping this car), do make sure you know what component is from what vehicle, OR your regular mechanic knows it and gets the right part.

The last thing you want is someone removing them, orders the wrong parts, forcefully fitting them in then causes other issues dowm the road.