In your situation I'd opt for a 30" wall oven and fillers. You'd loose the filler above the oven and the existing drawer. As I did you could fabricate a drawer under the oven and get storage if you really need it.
Being the counter top is granite, you can't go smaller on the cook top, I could not function that close to the wall, but a 36" cooktop would only require a minimal enlargement of the opening. Be aware all 36" cooktops, and 30" for that matter are not the same. When I replaced my 30" gas cooktop with a new one the opening was too big. I had to come up with some solution, so I put some tile that was a close match to the laminate behind the cook top. Not ideal but no too obvious. I'm reworking the counter tops now so that will be resolved.
Being the counter top is granite, you can't go smaller on the cook top, I could not function that close to the wall, but a 36" cooktop would only require a minimal enlargement of the opening. Be aware all 36" cooktops, and 30" for that matter are not the same. When I replaced my 30" gas cooktop with a new one the opening was too big. I had to come up with some solution, so I put some tile that was a close match to the laminate behind the cook top. Not ideal but no too obvious. I'm reworking the counter tops now so that will be resolved.