Create Drupal Events block with views

We currently have a local news website. On this website we add events that take place in the near future. Most of the events have a duration of 1 day, but there are also a couple of events that span multiple days. To add those events we have created an 'Events' node with a date field attached to it. The date module provides a way to add repeating days in quite a nice way. We have also created a views block with an overview of 5 upcoming events sorted based on their date (most recent on top). When an event has taken place, the event is automatically removed from this view. This works perfectly for events of 1 day, but events with multiple days aren't displayed as we like. Events should be visible on the day they take place and be removed the next day. For events with multiple days the event should be visible till the last day of this event. Currently the event is removed after the first day. We would like to change this behavior and extend the current functionality. Therefore we need some help with setting it up correctly. We are searching for somebody who is available on a sort notice and has a lot of experience with Drupal.