Aye, I think when I first implemented your fix those checks were in place. RegEx is a law unto itself!
I've replaced the RewriteCond with what you have on the blog right now, and added the [NC] flag to cover the case issue.
That's both the edge cases resolved from my side.
Many thanks!