i have the exact same problem, i keep waiting for the oiliness & the spots to pass, but i've given up now!
however, there are a few good products i have found over the years, avene skincare is fab, its available on prescription in france, boots sell it now, only the larger stores granted -their cleanance is great for keeping oil at bay, as for make up, Jane Iredale is good, i use their concealer, & for foundation i veer between the mineral foundation from jane iredale & estee lauder double wear foundation - they will give you a sample over the counter so you can try before you buy
these all help me, but if you stumble upon any new miracle products, let me know!