Keep working on your credit. Paying down high balances to 1/3 of their limit will give your scores a boost. Using and paying off credit accounts tends to help too. Don't close any accounts; this will lower your scores. So will paying off old collections. When a collection has been on your file for a while the impact tends to lessen over time. When you pay them off, it suddenly brings them back to the forefront and lowers your scores all over again. Once you are pre-approved with a lender, they may require some old collections to be addressed; this is the time to do it.
Congratulations on the work you've done, FHA will likely be your best source for a flexible loan with your improving scores. Talk to a mortgage lender after the first of the year to see what recommendations they have then. You'll have time to implement them before you've saved up all the down payment. Best of luck.