I can't tell you what to do next, but I can offer guidance on your next job hunt, if you decide that's what you want to do. Apply to medium-to-medium-large sized companies and ask on the initial screen interview if you'll be interviewed by the person you expect to report to. Don't continue the search at places where the interviewers are different than the manager.

Once you get this and make it through the HR and technical screens, make sure to let the prospective manager know your situation. Open up fully, tell them who you are and what you're looking for. Do this before the offer stage, and preferably before an onsite. Don't try to tactically approach it and don't go for any strategy other than being honest. Your hiring manager's reaction will instantly inform whether you're looking at the right team. If not, just bluntly ask if they know of any other teams at the company that seem like a good fit.

I think you will find this approach is less of a dice-roll. Whatever way you go, congratulations on your professional success and good luck on your next move.