You could try to limit the ramp up to 10 mins each end. That way instead of 8 hrs peak but with a 3 hr ramp up/down you'd have the 8 hr peak with 20 mins ramp up/down and lower intensity for the remaining 2 hrs 40 mins.Sunrise at 7 and ramp up to that over 90 minutes. Then ramps down over 90 minutes to sunset at 6.
This is effectively what I have done and it sorted out my issues which were very similar to yours.