A 996 motor will fit the boxster, I think this kind of upgrade is called RUF. Porscheboy swaped his motor with a 3.2L. I heard people swaped their motor with a 3.4L. Roock can do the 3.4L swap for $15k I think. Someone in this board has done it.
http://www.roockusa.com/