Get close again with your cute childhood friend

An androgynous elven prince who was either [1] forced to marry you as part of a human/elven alliance (the Elven King has no daughters), or [2] came to bind your small business with a contract after conquering the lands around your forge. (Based on some hentai manga, I forget which one...) Selfish, cynical, can play friendly but plot against you.