I've not tried using the flexi auth library with HMVC so I was unaware of the potential conflicting issues that you've had.
I've unfortunately not got the time at the moment to have a go at coming up with a solution myself, but your solution seems like a good band-aid fix in the meantime.
Also, awesome work on posting your solution back to help others with the same problem in the future.