ok the 2nd picture definitely shows that your plant is starting to get rootbound. Its not exactly panic time, but if you're watering until its flow out of the bottom of the pot, you're most likely drowning the roots at the bottom. Water less, but more frequently until you transplant. You'll need to do it within the next week or 2 for sure. I think your problem right now is a combination of rootbound and overwatering. The measurements of your current pot sounds like its around 2-3 gallons. Move up to a 5 gallon pot because you're going to need the extra room when flowering.