I think you made the right decision based on your criteria for what you expected!
I had several guinea pigs over the years and they are DEFINATELY stinky (compared to not having an animal at all). I've had a rabbit before and it's about the same smell. I personally didn't think mine were stinky...