Rebuild flippt first, there will be something you have missed out (glue/tape). Then improve armour but leave room for a bigger flipper servo or a higher voltage battery. So if there is still weight remains there is room to improve rather than having to rebuild a bigger shell that weighs more.