Hmmm. Seems a bit excessive. Well done.
I've written a step by step method of cleaning your engine bay created by using nothing but your your 2 pictures.
The all encompassing method towards a showroom engine compartment1. Remove absolutely everything - nothing should remain lingering...okay, maybe some of the wiring harness, but that's it!!2. Steam clean.
Following these steps will leave you grinning from ear to ear...you have a spotless engine compartment (note-please disregard the yard full of dirty car parts).
Now, go sit in that parked car, honk that horn, turn that steering wheel a few times, and turn up that radio...you're not going anywhere anytime soon BUT no one can ridicule your level of cleanliness.
By the way...I assume you're working on your engine (i.e. the cleaning was not your primary focus)
-Dave