It's hard for Ethereum to make a flippening with bitcoin, and jumping into the first position.
However, I believe Ethereum will maintain its second place strongly over years.
Agreed with you ETH is deserve to be on 2nd place with huge support all around the world. Potentially it will move this position very soon I think XRP not have use case like this so it will become much harder for it to stay on this position when this ecosystem will start moving in up direction.
There is only 0.42 billion left marketcap, eth very close to xrp and i am sure eth will take over in few days.
Just fill up bag with eth and wait for upgrade, now market chart looks great.