I know this sounds blunt but upgrade however you want, use the correct kexts, use the same clover stuff (plist etc), and just use clover its awesome!!!
P.S. You are lucky you have a custom built hackintosh. I have a Asus G750JM Laptop and upgrading is way harder... Also if you are very scared...