We do the same thing quite often (in fact, I am typing this from the CY CLT; we leave for Aruba tomorrow ) and it is frustrating - altho understandable from a hotel point of view.

In a situation such as yours, I too would take 2 nights - esp now w/ double stay credit.

And not only are BB's getting scarcer, but usage rules are getting more and more strict