I don't think you should retake the AFOQT. With my little knowledge of heavies boards and their selections, your scores aren't stellar, but they're not bad. Depending how you do on the TBAS and if your PCSM is decently high, I think you should be fine. The PPL will be a very nice addition to your package. I'd say knock out that TBAS with the best of your ability, get that PPL and start firing out packages. If you're not getting any bites, then maybe consider retaking one or both of them. Good luck!