Are you seeing a rheumatologist? They will be able to treat you for both diseases. I also have both and it takes a while, but eventually you will be able to tell which illness is acting up at any given time.
Plaquenil is more of a disease-inhibitor, you don't really see any change in Lupus symptoms you already have but it helps keep you from getting new symptoms. It has to build up in your body, you may begin to notice effects after 8-10 weeks. (Plaquenil isn't known to have any effect on Fibro.)
Naproxen (Aleve, right?) may have some effect on Fibro but isn't usually used for Lupus and I doubt it will help you any.
Have you had an ANA test? How are your inflammation numbers? What is your rheumy thinking? Or if you haven't seen a rheumy, please find one asap - they are the specialists in both Lupus & Fibro, other Drs are just not nearly as well educated in these illnesses.
You probably need something for inflammation (if you have inflammation, that is the Lupus). One of the ways they differentiate between Lupus & Fibro is that Lupus responds to Prednisone (anti-inflammatory) and Fibro does not. Otherwise it's impossible to tell the difference.
Are you getting good sleep at night? Sometimes we don't sleep well and need a sleep aid and that ends up helping with the fatigue. Eating well? Maybe add some B12 to your diet.
Lynnwood, Lupus & Sjogren's Moderator, Dx: 2002DIAGNOSING LUPUS & HW's LUPUS 101
"Life is far too important to be taken seriously." - Oscar Wilde