Gabhaidh is in the dictionary and in the songs. That's how I learned it first.
'Gabhaidh' is a different word to 'gabhaibh', so I wouldn't accept it here. Do you have any specific examples of its usage? I'm not sure I've ever come across that spelling being used.