Realized that I should have(a long time ago) ordered some high quality LEDs. The standard inexpensive ones I always get are not cutting it. Did a brief search on Digikey and found some serious ones for the job that should be a lot better and also are still 0603 so no need to order a new board.

Red:

http://www.digikey.ca/product-detail/en/APTD1608SEC%2FJ3/754-1542-1-ND/2514675

Green:

http://www.digikey.ca/product-detail/en/XZM2DG53W-8/1497-1162-1-ND/4745508

The IR and the NIR are already powerful enough I hope.