I just wanted to comment on the out-of-bosses combat point, I was actually moreso referring to other puzzle mechanics similar to switches, just so that the stick/aiming maybe isn't entirely irrelevant when you're not interacting with switches or fighting bosses. That being said, I think between the switches and the bosses it probably already has enough purpose to be fine the way it is. Your approach is very sensible regarding time investment and focusing on bosses!