Tbh, i think engine bay cleaning you have 2 choices.
Either remove engine, degrease, clean, polish, wax etc. Clean the engine properly and refit.
Or just dont bother.
I say this becuase when you go to a show, you will see spotless smoothed cleaned engine bays, with paintwork as good as the car body. And you just think, why did i bother? lol.