Well, if I were you I would upgrade Nasturium ('cause she has nice abilities) or Geranium for her x1.2 skill rate and skill lvl5/4 slots. It just depend on what you need more. But I think I would prioritise Geranium.
For magic type... well. Mirabilis. She is nice, she has counter and 4 slots for specials equipments. And her skill is not bad (and her evolved form is really pretty).