hi gulkaran,
You are doing it right. In the downstream are you using AWG bidirectional Mux/Demux?
I suggest you to use simple WDM MUx/Demux separately for your upstream and downstream respectively and try using fabry parrot filters in the optical domain instead of low pass bessel filters. Also try to use Optical amplifiers with gain output. I hope it will help.
Regards