I have been at the range more and want to upgrade. I mainly shoot my AR 25-50 yards, never more than 200 yards, and focus mainly on defensive drills. I’m mainly shooting a mid length pencil barrel with A2 front sight and budget red dot. I like the pencil barrel and mid length but would like to free float, upgrade trigger, upgrade stock, and upgrade red dot. Is my money better spent upgrading the rifle I have or just buy something with a rail and stock and likely a better trigger, then upgrade the dot down the road. Thanks for you opinion.