Photos on Cellular Data - Upload & Download

Hi - I'm trying to work on limiting data usage but also being able to access full res photos on my phone when needed. I have my photo setting set to optimize space on the phone so it uploads originals to the cloud.

I have both ICloud and Photos set to allow cellular but that runs a lot of data. Is there a way to have the "upload" to the cloud only process when on wifi, but when you are trying to access photos on your device that leverage cellular data for the full resolution image? The settings seem unilateral that it's either cellular for both or wifi for both, but not an option to save both. I do NOT have "unlimited updates" turned on, so aware it's capped to a degree

I know you can turn the upload off completely, but then it becomes a manual reminder process.