your 36" hose is fine, though if you haven't dove it yet, it may be worth seeing if you can trade the 32" with ball swivel for a 22" without a swivel you will have much better and more streamlined hose routing than you have now. Hoses should be replaced roughly every 5 years, so that's a long time to go with less than ideal hose routing....
Even if you are doing the normal padi golden triangle nonsense, a 36" hose and 22" hose work better, just reversed in terms of primary and secondary from what I would recommend