Ok...that is not an easy question to answer and you may need a touch of "trial and error" for the next two weeks. I would save the Naproxen for "bad days" and if necessary double the dose to 1,000mgms.
I can quite understand advice given to take it regularly whether in pain or not.
You don't say if you have Rheumatoid or Osteoarthritis but if it is the latter, then one might be thinking of joint replacement.
Your choice.....but i would save the drug for the bad days doubling up on the dose if necessary.