What about getting you motor rebuilt? Maybe you can specify better pistons etc. if they are available. You could also avoid the oil pump falling off issue by getting the proper amount of Loctite on the bolts instead of relying on Mr Nissans robot to fuik it up.
This would depend on having a decent mechanic in your area that you trust.