Not sure if you'd still see this 4 years later, but I wondered if you ever got it sorted? This sounds just like me...