I think an 030 can directly replace the 020. Cant remember though. I thought 020 because its on hand. But 030 is more plentiful.

That application note is exactly what I needed.