As a follow up...
I picked up an H2 buffer and swapped it for the H that was installed when the problem first began. Unfortunately, problem still exists and seems like the buffer didn't improve it in the slightest.
Just ordered one of the Wolff extra power springs and fingers crossed that it solves the problem. In a perfect world I'd put a switchblock on the the rifle and call it a day, but it's pinned/welded and has a 12" rail on a 14.5" barrel- so that would be absolute worst case scenario.
Thanks for the help and advice guys, I appreciate it.