See the [recent work of Spiritus, Lehmann, Renes, and Zoutman](https://www.dropbox.com/s/w9vpqczjuf554d8/SpiritusLehmannRenesZoutman2022.pdf?dl=0) on optimal taxation with multiple income sources. In principle, one can use this optimal tax theory with the inverse optimal tax method.