You can add more Junk Arms for versatility, may drop a catcher for that. I personally feel Black Belt would be a staple now since Gothitelles and Ross.dec are running around. Energy count is about right since draw engine is lacking, may reduce it slightly depending on your testing.