I have a similar goal for my red rye APA. I bitter with Columbus then Simcoe, Chinook, & Centennial late in the boil and dry hop. For you goals, I would probably replace the Centennial with Columbus. I get a lot of earthiness from the rye though...
I agree that the Willamette will get lost unless you use a lot more of it.