no on Cordero/Coghlan. the sort of OF that i list around the same area as Cordero is guys like Bruce, Rios, Ibanez, Span, Bourn, Morgan, Gonzalez. Coghlan gets ranked much later.
Davis for Francisco works for me. i see that as an upgrade actually and you have the extra RP's to survive moving one. you're upgrading 25 ranks on one ranking that i saw.