+1 to always keeping it as a Sapphire at least, though I would leave the CL at $5,000 at a minimum, actually I would not change the CL at all. Re-PC back to CSP when points usage gets into the plan.
Consider transfers to Hyatt, not just airlines. There are some lower tier Hyatt's that get good redemption rates and may be in locations you are headed.
For now though, your plan to pay the AF is good. Your travel spend may shift, if you already used the bonus points, so besides dining you may be adding some airfare spend to the 2pt category.
Use the Freedom regularly too, take advantage of the 5pt categories.
Good luck!