Rename using regular expressions - one expression to deal with 2 different filename situations

Using a rename script is probably easier than coming up with a single regex (especially if more filename formats are needed in the future).

You could adapt this one: Script to perform multiple Regular Expressions

Alternatively, for a toolbar/menu button or hotkey, you could also run the Rename command twice, with different regex, and avoid scripting. The Rename dialog can generate those commands for you (use the Clipboard button/menu at the bottom), and you'd just want to add the NOMATCHNOFAIL argument to the two commands, so they doesn't skip files which fail the first regex.