I'd hoped the first wouldn't happen but I can't say I'm surprised...it can be quite dogged in doing what you tell it (even when it isn't want you want). I'm wondering if you could set the module to complete on the next to the last page if that would 'trigger' completion early. I'd try but can't do it with Captivate (what I use, sadly) and my trial Lectora has nothing close to complete---though I KNOW Lectora can do that--I did it many time in the past.
I can tell you the second option is possible as I have done it with Lectora and with Captivate. Once, I had a Lectora zip package with no licence and I made it work. That was a feat (not all me, I got some help from a techie type)! I can't imagine Rise wouldn't be able to do it. It has always been my understanding that Articulate products have better functionality/flexibility than Captivate but not quite as much flexibility as Lectora...