Here are some suggestions. On steel I use a 10% Nytol solution which I apply with a Q-Tip until I can see the contrast, then I rinse off and dry the sample. I then use Navel Jelly on a Q-tip with a circular motion, then wipe off with a soft cloth, but do not rinse off. You can also try the Navel Jelly alone. The Navel Jelly is both an etchant and prevents rust from forming before I can photograph the sample.
On the aluminum, I use the yellow can Easy Off oven cleaner...I only leave it on for a short time, then rinse off and dry. I get great results with this method.
Hope some of this helps.