Amano does usually manage well enough in spite of (or even because of) all the totally random crap she pulls. XD But yeah, like you said, sometimes it just does not add up at all and the end result is really sloppy and annoying. In her defense, there's a reason pretty much my entire "why did this have to happen?" list is taken from the second half of the Future Arc. I have virtually no complaints about the rest of the series (and I thought long and hard about it, too).

I gotta say, my favorite part of all his upgrading has to the fact that he can fly now. There's something about a flying swordsman that's just. Awesome personified. XD