JS,
You are usually spot on, but in this case, I would worry about using an austenitic filler due to the stresses created during heating and cooling cycles. A nickel based alloy would probably be a beter choice to reduce that stress. It provides all the advantages you mentioned for the 309 without the stress concentration drawback. Also, if the PWHT is over 1175F or so (or for a long time), I would worry about embrittlment of the 309 due to high ferrite content.