Glenn, sorry about the engine.
The original engine in my '99 996 went out last year at 92,000. I replaced with a factory motor and have been enjoying it (and the warranty). The '99's are light and nimble compared to latter 996's. Really a lot of fun.
Unfortunately now I'm changing jobs and moving so mine is up for sale.
I hope another Porsche ends up in your stable soon.