Marine blue and marine white should work for now I think, but someone else may have a different opinion.
If I were to change the bulbs, I would keep the marine white and change the marine blue to a "Power-Glo 18,000K" tube which has served me well for planted tanks and they are a bit purple-ish white, so you wont get that yellowish lighting that youre talking about. Hope this helps