Wow, let me start by saying congratulations on a terrific turnaround! I have never sat on an adcom but I think if you get some good rec letters and again get a good step 2 score that you should match at a very good program. The second year repeat does raise a red flag and would leave me wondering (if I were reviewing your app) what might have gone wrong and whether there was a significant chance of things derailing again. Your subsequent performance, however, paints a very positive picture and will likely overshadow the second year issue. The pubs also help provide a significant nudge.
I think you should apply a little wider than someone with your stats normally would, but assuming you keep doing this well if you make a list of any 10 programs you are interested in you will probably match at one of them, and likely one of your real first choices (but send more applications just in case, you can always turn interviews down!).