I guess it's completely up to you.
Do you want to do an engine swap? Do you want a sunroof or not?
IIRC both D16's have the same power output.