Actually WD-40 will ruin the black paint on your Engine Block......WD40 has the tendency to eat up paint.
Use WD40 everywhere else....... except on the engine.
I'm afraid the only way to stop the block from the surface rust you have repaint the block with heat resistant paint. The aftermarket heat resistant paint is tougher than what it had originally. I think its cheap fix.....