engine swap or rebuild?

I want more power from my 87 crxsi. I have a delema, should I do a engine swap with a d16(the easiest I think?) or just find another 1.5 origanal engine and just bore it and build it up? not planning on racing it. Any help would be helpful.

Both swaps will be alot of fun. You'll probably learn
more from doing a D15 rebuild, but the Dohc ZC swap
is fast!!

j