Brian, thank you for your input. I did end up redoing much of it and I think I finally got it :)
This is also dimensionally correct as I needed the diameter to be 15mm.




Thanks again!
Gunter