I'm a similar height and I ride a 58cm, 54 seems small so I hope you can make it fit you properly

Also are you going to ride gravel? If not be aware a gravel bike will be a little slower than a traditional road bike, not like 3 mph slower but it will be a measurable difference. It should be more comfortable though.