I would highly recommend getting the book "Get Your House Right"
The structure you are working with has a lot of very strange and naive combinations of elements that don't quite work. If you were to correctly resolve the entablature, it would go a LONG way to making it read more coherently and harmoniously.
This book would be an invaluable resource for you in understanding exactly how to fix your building so it feels right, instead of clunky.