Hey guys, thanks for all the input!
Actually Razer support was pretty nice: since I opened the ticket before my warranty expiration, they honored the ticket I opened and fixed my laptop without any costs! (My warranty ended in January and I sent the machine to them on March).
So far is working fine, if happens again in the future I will try this idea of building your own battery pack.
Cheers!