My mistake is that I've let this researching go on too long, and now I can't make up my mind. Cut-off date is 1 FEB for me, decision will be made by then (pay-day too!).
I'd rebuild the original if you want to keep a better value on your 'bird. If you want to modify, buy another and keep original block to rebuild to stock spec or close to.
