Need Help with Internal Link Building Structure for thousands of pages

Hey
My competitor is getting result so i'm following it's strategy . Currently, most of my pages like my competitor are 1 tier : example.com/page

have 6 main services : example.com/service1 example.com/service2 ,,,,
Have +500 city pages for each service : example.com/service1-london example.com/service2-london ....
Have +200 niche pages for services : example.com/service1-realestate example.com/service2-realestate

But i think something is not right! So I'm here to ask your help to give me some suggestions for better internal link structure

if i use single city or niche page (example.com/realestate) (example.com/dubai) and combine all services details (service1,2,3...) on 1 page for each, i will loss many keywords, and niche or local targeting and my competitor

if i use city and single name silo structure (example.com/service1/dubai) ( Example.com/service2/real-estate) , it may confuse search engine because each service will have same slug city or niche (.com/service1/Dubai) (.com/service2/Dubai) ...


and with the current approach, i think i cant show the topical structure well. What do you suggest?