I'd tell them they are on the brink of loosing a sale, and a repeat customer, and that you are inclined to to let everyone you know hear about this.
Speak to the GM of Sales first and explain this. If they don't do anything for you (cut the price, throw some stuff you want in with the deal) then tell them to expect a letter in the mail.
Write out the letter explaining situation and how they lost the sale and loyal customer. CC it to JDpower, Subaru America, your local BBB or Consumer agency, your local newspaper. Send it registered.
Get on the wait list at the best, closest dealer... the one with a reputation for the best service dept.