Hey, this sounds a little bit like my engine rebuilding topic.
I also think you shouldn't be shy about pulling the engine and building it properly. Especially if it's not your only car. Although I can see why you'd want to be able to drive it while the weather is still great.