Maffew
Born. Raised. Habs. Always.
I'd do it. That, or AJ lucks into a win and then drops it to Joe at HIAC.
I'd have Orton move into a program with Styles, too, either after Styles drops it or heading into WM. Styles is the ultimate "Indy darling" and still does "too sweet" sometimes and is a fan favourite that Orton would feel has been disrespected for.
I don't know if I'd have Joe be a tweener champion who takes on anyone, but I think I'd have some programs with the likes of Rusev, Hardy, and eventually Bryan getting a title program. Bryan's return journey ending with him (finally) winning the Rumble and facing Joe at WM for the title would be sick.
AJ could even drop the title to Joe via interference from Orton to transition into their feud without even hurting AJ at all, while giving Joe the title for a run with it. Use the "Orton hates indy darlings" angle and it works perfectly.