@fotomatt1, I'm a big fan of doing a recovery and restore of my iPhone if it starts acting cludgy. Just make sure you have a couple full backups first (including encrypted if you have health data on your phone, so you get it backed up as well).
Worth popping into an Apple store to have them run diags on it for the battery.
If it's still causing you grief every day after doing what you can, then I'd say you have no choice but to pull the trigger on an upgrade.
I think I'm going to do it. At least my 6 is still at a point where I can still get a decent price for it on eBay and if I get a 7 and want to upgrade 8 months from now I'll be able to sell that for a decent price. I work in marketing in a consumer electronics business, and I should know better than to start waiting for a product for a long stretch of time.