I had it Castillo over Mayweather 8 to 4 the first time I saw it...but recently I've been swayed more towards a draw.
Ironically, I felt Mayweather was the better fighter, although I had the same scorecard as you the last time I scored the fight.