Laryngitis or Tonsillitis?!

Laryngitis or Tonsillitis?

These are my symptoms, day-by-day: (Im a young teen btw)
Friday: I woke up and I had pain when swallowing. Keep in mind, on Thursday I just had a friend come over and we didn't do anything much; but she wasn't sick. On Friday, I drank a lot of water and I didn't feel the pain when swallowing as much. Later, it came back.

Saturday: Same thing as yesterday. I wake up with a headache and pain with swallowing. it lasted throughout the day, except when I was under the influence of tylenol. I felt sickly in some parts of the day. When I went in the pool, I felt better; then later it came back.

Today (Sunday)- I had trouble sleeping, and when I woke up I couldn't speak without making strange noises; but I could whisper. I went into my mom's room and she said it was most likely larangytis. It was hell, hell, hell for a couple of hours. I could barely speak. Then a couple hours after I woke up, I could just barely speak in a normal voice.

6 days ago
For breakfast I had toast, water, and some bacon. After breakfast, I gargled with warm water & salt, and then had a Vitamin C pill. I can still just barely talk in a normal voice. Then, my Mom and I became concerned that it may be tonsilitis. My mom looked at my tonsils and saw something different from my healthy sisters tonsils. I will try to get a picture. There weren't enormous white dots, but she thought it may have been small white dots. it could've also been saliva reflecting because of the flashlight.

6 days ago
I just has strep 3 weeks ago. it is highly unlikely I have it again. I am hoping to feel better by Tuesday

How about Strep throat? That is another possibility which has the same symptoms. But the determining factor is to see weather or not your tonsils are swollen. A doctor's visit seems like a logical course of action.