If my most recent suggestion can't be implemented, I think Warlock Punch should...
- Get its cancel back,
- Still ignore shields, but
- No longer be a OHKO;
It should be just a tad more powerful than the final hit of a Falcon Punch instead.
Personally, I didn't have any problem with it...