I say swap also, but the d16a6 is a very nice motor..IMO probably the best D-series motor honda built.
My buddy had a custom turbo kit on his crx with the stock d16a6....
with 9lbs he was putting 190 to the wheels and running high 13's, best of 13.6 and all on street tires