Sleeping pads will make a tremendous difference in comfort and warmth. I have spent plenty of cold nights on a Ridgerest foam pad, and I'm sure the heavier, more expensive self-inflating pads are even more comfortable. Socks and hats will help, too.
This ought to be a great time for Yosemite--have fun.