Keep originals for videos not photos

In an effort to save space on my iphone, I set icloud to optimize iphone storage. The problem is that when I want to view a video, I have to wait for it to download. Is there a way to set icloud to download and keep originals for videos, but still optimize iphone storage for photos?

I know I have the option of moving my videos to itunes, but ideally I'd like to keep both in one library, and I'd like to see if there's a way to do it the way I prefer first.