It looks worse but I think between my two suggestions it's the lesser of the two evils because you are not using SS1.0 which is officially going to be deprecated one day, plus you still have the modular architecture and separation of server and client code