YES.
If you don't want to exploit, then do not exploit. You're only killing your own fun. There's no need to ensure that no one else has any fun either by nerfing all possible combat uses of Sneak or Invisibility into the ground even more than they are right now.
More importantly, your fix doesn't do anything because your current method of exploiting is equally possible without factoring in Sneak by taking the Escapist Talent.