Work-Around
If you are staying more than one night, use points or cash for those nights and apply your Suite upgrade to those nights. Then book your free night, and call the hotel to ask them to merge your reservations. Unless the hotel is sold out, normally they will not make you change rooms.