If they fit close in the store, take them to a boot fitter and get them properly fitted. I got the pro lights last fall and made a few small changes that made them 10x better. The liner is shit....get rid of it. I put a pro wrap I already had in mine but I'm going to get pro tongue instead because I tour in them and the wrap is not so great for that. If you are just shredding resort through I would recommend the wrap. I also got Soles, I personally find them to be the best cost:quality balance for a high arch foot support.
Just saying, no boot is ever going to fit perfect straight out of the box and there is no point in suffering through pain or spending more money on another set of boots when you can just improve the ones you have. These boots are the tits, so if you keep and work on them you'll love them. And if you sell them then the buyer is getting a sick deal on some killer boots that I would highly recommend.