I just called the Oregon Revenue tax hotline and was told the same thing as in the letter I received--BOTH stimuli are advance payments and BOTH have to reduce the federal tax subtraction on the Oregon return. That's their position.