Rise divided by run is correct; % grade is important in several contexts to my profession and industry. Reality is that you can use hypotenuse if you want. Using a 10% grade as an example, that gives a 5.71 degree angle, the cosine of which is .995. That means that your answer will change out in the 2nd or 3rd decimal point. Big fat deal for biking calculations.