Advice

Hi. As yet I am undiagnosed but have a family history of Rheumatoid/inflammatory arthritis.
Both my knees stiffened up at the beginning of May but weren't painful just uncomfortable, then 2 weeks later my left knee became swollen and painful. I rested, kept it raised, did ice packs, all of which were great, but when I started doing things it all just came back. Then I went on holiday and drove for over 2 hours (both knees supported with tubigrips). But pain in right knee started after about an hour and the following day my right knee had swollen to nearly double the size. During the week I did what I could to support both knees but worried about driving home. Someone suggested putting support above and below the knee for the return journey which worked well and got me home safely.
Since then I have read up about arthritis and have started a daily routine of gentle exercises and keeping mobile. Things have gradually improved and during the day I can pretty much do most things without thinking about them. (Although my left knee can still be painful at times, the right knee is still swollen a bit and both are stiff first thing in the morning).
Bottom line is that I have had xrays done and am awaiting the results but it seems such a long process to get a diagnosis. So after all this waffle......Can osteo and rheumatoid arthritis just back off and symptoms ease without any treatment (or diagnosis)? I just want to know my facts before I go back to the GP! And is this progression of symptoms normal for arthritis? Thanks