Idk, I think 'OGCD attack that targets enemy, does damage, gives buff' changing just the OGCD portion to GCD, and having it upgrade from 'GCD attack that does damage and gives buff' to 'GCD attack that does damage (now with AOE) and gives buff' is a lot less jarring than having 'selfbuff that increases damage dealt' upgrade to 'move that increases damage dealt, and can be used with or without an enemy present, doing damage if there is one'. We already have a move that works that way, it's Holmgang. And people macro it to selftarget it, because being out of range but having something targetted makes it fail to activate. I see you say 'make it not melee range' but that's a bandaid fix. Req feels 'meh' at the minute, a 300p ST GCD we hit before doing the burst window. Making it a GCD removes a weave, yes, but it allows for SE to make the potency much higher to compensate (as example, NIN GCD mudras went from Raiton being 360 to now being 650 (dont remember what it was in SHB, might have been as high as 800 at the time, i don't recall).
As for Goring, well, they really just copied Sonic Break and called it a day. I'd have done the rework different, and that'd have given Goring and Shield Bash a place in the rotation, but I'm not the devs and so we're here. In any other game I'd suggest 'what if we have a trait that reduces the CD of Goring by X seconds each time you Atonement' but then it isnt aligned with the all powerful, way-too-emphasized raidbuff window. With the way fight design is so subservient to the 2min burst now, I don't think it is even possible to 'fix' Goring. Only thing that comes to mind is to rework it to be another proc off of Rage of Halone (later Royal), and change Atonement from 3 stacks to 1. But that'd screw with the rotation loop too, so that doesn't exactly 'fix' things either. They painted themselves into a corner on it.
I'd have had 3 combos: Fast - Riot - Royal - Atonement generates MP, Fast - Shieldbash - Goring - HS spends MP. Conf - Blade - Blade - Blade also costs MP so you need to make sure you have enough going into burst window. Thus, the rotation is built from six of these '4 GCD blocks', and you can freely mix them up as you need. It has versatility, adaptability, it doesn't require you to do jank stuff like 'purposely drop Atonements', but it'd still have a bit of the old 'shift things around to optimize around downtimes' people liked about ye olde PLD. If you know there's a downtime like High Concept, you can purposely change out Atonements for Goring combos to spend more MP, and your MP economy is okay with that because you're generating MP in the downtime. And the best part is, Shield Bash becomes an actual part of the rotation, we get to hit things with our shield instead of it just sitting there looking pretty