Hello, I believe master options that are used to fill choice components count towards row limits, right?
There should be certain common ones available for use without going towards row limit. i.e. list of countries, list of zip codes in the US, list of cities, list of phone area codes, list of time zones. You know what I mean. These lists are too big and it will easily cross threshold of 500 rows.