Well, before the Holy Knights were introduced, I really thought they would send someone from Cp0. No way any cp0 Agent could take on Magellan.
I just hope Oda will still address this open plot. I had my first doubts already when we cut to Impel Down during Egghead Island, and we haven't gotten any signs about an assassin then.