I don't think it's a question of #1 or #2. I think Milos is #1. I think it's a question of whether Frank gets #2 or not. In my opinion on clay anyway Peter is #2
As of these days, yes. I think Frank is #2, even if his ranking isn't as good as Peter's. I don't think it'll be long before he catches up to Peter though. He's way more consistent, and can actually get a few wins in the ATP main draw too. He seems like a good player finally coming back from injury.