Ran into this EXACT issue with mine last year.
This is what I did to help/fix this.....
-Like you stated, i cut the existing bolt holes on the top side so the TOP of the header port was the same height as the TOP of the exhaust port. (no need to weld up the old holes, they will just be an oval...