I'd say wear the beret with the badge that was given to you or wear the EGA that you also are entitled to wear.

I have a Sorta Kinda Maybe similar issue.... as you know I was in the USAF, but when I was on a SF Combat FOB I was attached to the 25th ID and wore the patch on my BDUs in the combat zone. Im very proud of this service yet I'm hesitant to wear or display the patch on anything (hats, Shirts, or display cases) here stateside. What are your thoughts Birddog?

Something I never hesitate to do is display and proudly wear my old USAF FireDawg badge. Guns and Hoses Baby!!!!

Also, if you were to wear a USAF tartan, what would you personally wear as a cap badge?