Sounds plausible. Now I just need to figure out how to reliably do that sort of work myself in my garage.
I have two blocks now anyways for better or worse, so I'll probably try to work out a system of rotating the two blocks once a year or so and then working on beefing up the previous block before the next swap. Maybe for the first iteration I'll just fix any obvious damage, replace wear-items, and stick in a Nismo oil pump. Then we'll see if I can go further for the next one once I at least halfway know what I'm doing