I do basically your exact recipe except I add 2 tbsp of [PB2 ](Bell Plantation PB2 Powdered Peanut Butter, Net Wt. 16 Oz. https://www.amazon.com/dp/B00H8YGOMO/ref=cm_sw_r_cp_api_CYKUybH9J2HHY) for additional protein and use almond milk or cashew milk and no cinnamon. Sometimes I add frozen blueberries (mix in the night before) or cut up banana (added the morning of) Delicious!!! You could do [chocolate pb2] (Bell Plantation PB2 Powdered Peanut Butter with Chocolate, 1 Pound https://www.amazon.com/dp/B00H9GWY5W/ref=cm_sw_r_cp_api_kZKUybA384H0Z) and leave out the cocoa powder and reduce the sugar a bit too.

Edit: I made it with water once because I ran out of almond milk and it didn't taste as good IMO. I choked that morning's down and haven't let myself run out again. I buy the shelf stable cartons from Costco so I always have some in the pantry.

I would def consider adding additional protein. I have left it out a few times and I get hungry much sooner. The additional protein gives me much needed staying power.

Edit2: I add 1 cup of liquid (almond milk/cashew milk) when I make it at night and then top it off in the morning with another splash (probably 1-2 tbsp). This gives me the consistency I want in the morning. If I add all the liquid the night before it all gets absorbed and I like to have it more like a thick cereal. That sounds gross when I write it but I swear it's good.